Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3

2020-02-11 17:20:40 +01:00
parent 29a6b1a8da eaa0b53f30
commit bd6b84dc23
2 changed files with 4 additions and 4 deletions
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -131,7 +131,7 @@ public class NetServer implements ApplicationListener{
                return;
            }

-            if(admins.getPlayerLimit() > 0 && playerGroup.size() >= admins.getPlayerLimit()){
+            if(admins.getPlayerLimit() > 0 && playerGroup.size() >= admins.getPlayerLimit() && !netServer.admins.isAdmin(uuid, packet.usid)){
                con.kick(KickReason.playerLimit);
                return;
            }