mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2025-04-13 22:23:42 -04:00
commit a906ce0cd9
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/src/mindustry/net/NetworkIO.java
View file

@ -114,27 +114,27 @@ public class NetworkIO{
buffer.putInt(netServer.admins.getPlayerLimit());
writeString(buffer, description, 100);
buffer.putInt(Core.settings.getInt("port", port));
if(state.rules.modeName != null){
writeString(buffer, state.rules.modeName, 50);
}
writeString(buffer, state.rules.modeName == null ? "" : state.rules.modeName, 50);
buffer.putShort((short)Core.settings.getInt("port", port));
return buffer;
}
public static Host readServerData(int ping, String hostAddress, ByteBuffer buffer){
String host = readString(buffer);
String map = readString(buffer);
int players = buffer.getInt();
int wave = buffer.getInt();
int version = buffer.getInt();
String vertype = readString(buffer);
Gamemode gamemode = Gamemode.all[buffer.get()];
int limit = buffer.getInt();
String description = readString(buffer);
int hostPort = buffer.getInt();
hostPort = hostPort != 0 ? hostPort : Vars.port;
String modeName = readString(buffer);
short port = buffer.getShort();
int hostPort = port != 0 ? port : Vars.port;
return new Host(ping, host, hostAddress, hostPort, map, wave, players, version, vertype, gamemode, limit, description, modeName.isEmpty() ? null : modeName);
}