Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Petr Gašparík
2020-02-11 17:20:40 +01:00
parent 29a6b1a8da eaa0b53f30
commit bd6b84dc23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -21,9 +21,9 @@ First, make sure you have [JDK 8](https://adoptopenjdk.net/) installed. Open a t
#### Windows #### Windows
_Running:_ `gradlew desktop:run` _Running:_ `gradlew.bat desktop:run`
_Building:_ `gradlew desktop:dist` _Building:_ `gradlew.bat desktop:dist`
_Sprite Packing:_ `gradlew tools:pack` _Sprite Packing:_ `gradlew.bat tools:pack`
#### Linux/Mac OS #### Linux/Mac OS

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

@@ -131,7 +131,7 @@ public class NetServer implements ApplicationListener{
return; 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); con.kick(KickReason.playerLimit);
return; return;
} }