From 98f012feb8802dbaff7280bf9de4c65becb65d87 Mon Sep 17 00:00:00 2001 From: AydenRennaker Date: Tue, 5 May 2020 12:46:53 -0600 Subject: [PATCH 1/3] Update servers.json (#1989) * Update servers.json * added a record to server name. Server has moderation, logging of user actions with /history, custom maps. Ready for players. --- servers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers.json b/servers.json index 2d108bbab0..25b4c3b8df 100644 --- a/servers.json +++ b/servers.json @@ -43,5 +43,8 @@ }, { "address": "mindustry.kr" + }, + { + "address": "mindustry.atannergaming.com" } ] From 8a48a8bf3d7f67fa273f8182945a3201a94fb20d Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 7 May 2020 15:41:16 +0200 Subject: [PATCH 2/3] Fix only the output of the last chat filter mattering (#1997) --- core/src/mindustry/net/Administration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index a068dc9472..e1ce90f8fe 100644 --- a/core/src/mindustry/net/Administration.java +++ b/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; From 018ef5daf43e5d851c5bd91fffbc4664ba5053aa Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 7 May 2020 17:28:42 +0200 Subject: [PATCH 3/3] Change baseunit pred variable from b to u (#2002) --- core/src/mindustry/core/Logic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 91bd2c7020..56beaf4101 100644 --- a/core/src/mindustry/core/Logic.java +++ b/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()){