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

2018-03-15 12:57:03 -04:00
parent 155f3945a6 ae89a004a6
commit b4ec2ccb90
13 changed files with 278 additions and 270 deletions
@@ -383,7 +383,14 @@ public class Packets {
    }

    public enum KickReason{
-        kick, invalidPassword, clientOutdated, serverOutdated, banned
+        kick, invalidPassword, clientOutdated, serverOutdated, banned, gameover(true);
+        public final boolean quiet;
+
+        KickReason(){ quiet = false; }
+
+        KickReason(boolean quiet){
+            this.quiet = quiet;
+        }
    }

    public static class UpgradePacket implements Packet{