Merge remote-tracking branch 'origin/master'

core/src/mindustry/core/Logic.java

@@ -212,7 +212,7 @@ public class Logic implements ApplicationListener{
 
         if(state.isGame()){
             if(!net.client()){
-                state.enemies = Groups.unit.count(b -> b.team() == state.rules.waveTeam && b.type().isCounted);
+                state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.type().isCounted);
             }
 
             if(!state.isPaused()){

core/src/mindustry/net/Administration.java

@@ -89,7 +89,7 @@ public class Administration{
     public @Nullable String filterMessage(Playerc player, String message){
         String current = message;
         for(ChatFilter f : chatFilters){
-            current = f.filter(player, message);
+            current = f.filter(player, current);
             if(current == null) return null;
         }
         return current;

servers.json

@@ -43,5 +43,8 @@
   },
   {
     "address": "mindustry.kr"
+  },
+  {
+    "address": "mindustry.atannergaming.com"
   }
 ]