mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 00:05:23 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2020-05-07 14:05:31 -04:00
commit 542555d721
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/Logic.java
View File

@ -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()){

2
core/src/mindustry/net/Administration.java
View File

@ -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;

3
servers.json
View File

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