Merge remote-tracking branch 'origin/master'

2020-06-04 14:50:16 -04:00
parent 803f9e8eb6 733713c9a2
commit 17b1eaf1b6
1 changed files with 2 additions and 1 deletions
--- a/core/src/mindustry/net/NetworkIO.java
+++ b/core/src/mindustry/net/NetworkIO.java
@@ -1,5 +1,6 @@
 package mindustry.net;

+import arc.Core;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.core.*;
@@ -72,7 +73,7 @@ public class NetworkIO{
        writeString(buffer, name, 100);
        writeString(buffer, map);

-        buffer.putInt(Groups.player.size());
+        buffer.putInt(Core.settings.getInt("totalPlayers", Groups.player.size()));
        buffer.putInt(state.wave);
        buffer.putInt(Version.build);
        writeString(buffer, Version.type);