Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-12 16:51:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Check for negative GameModes in ServerPlayerListEntryPacket

Browse source 
These are sometimes negative for some reason. I was only able to
reproduce this on one server, but this fixed it. The server was
sending out a GameMode of -1.
This commit is contained in:
Jadon Fowler 2016-08-23 20:18:41 -07:00
parent 8b1b94cb7c
commit 27baf233c9
No known key found for this signature in database
GPG key ID: B98B526268287A29
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/spacehq/mc/protocol/packet/ingame/server/ServerPlayerListEntryPacket.java
View file

@ -63,7 +63,8 @@ public class ServerPlayerListEntryPacket implements Packet {
profile.getProperties().add(new GameProfile.Property(propertyName, value, signature)); profile.getProperties().add(new GameProfile.Property(propertyName, value, signature));
} }
GameMode gameMode = MagicValues.key(GameMode.class, in.readVarInt()); int g = in.readVarInt();
GameMode gameMode = MagicValues.key(GameMode.class, g < 0 ? 0 : g);
int ping = in.readVarInt(); int ping = in.readVarInt();
Message displayName = null; Message displayName = null;
if(in.readBoolean()) { if(in.readBoolean()) {
@ -73,7 +74,8 @@ public class ServerPlayerListEntryPacket implements Packet {
entry = new PlayerListEntry(profile, gameMode, ping, displayName); entry = new PlayerListEntry(profile, gameMode, ping, displayName);
break; break;
case UPDATE_GAMEMODE: case UPDATE_GAMEMODE:
GameMode mode = MagicValues.key(GameMode.class, in.readVarInt()); g = in.readVarInt();
GameMode mode = MagicValues.key(GameMode.class, g < 0 ? 0 : g);
entry = new PlayerListEntry(profile, mode); entry = new PlayerListEntry(profile, mode);
break; break;
case UPDATE_LATENCY: case UPDATE_LATENCY: