Skip to content

Commit dd687ce

Browse files
committed
Fix NPE in PlayerInfoData equals
Fixes #1400 Closes #1106
1 parent 8774d87 commit dd687ce

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/java/com/comphenix/protocol/wrappers/PlayerInfoData.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
import java.lang.reflect.Constructor;
2020
import java.util.ArrayList;
2121
import java.util.List;
22+
import java.util.Objects;
2223

2324
import com.comphenix.protocol.PacketType;
2425
import com.comphenix.protocol.reflect.EquivalentConverter;
2526
import com.comphenix.protocol.reflect.StructureModifier;
2627
import com.comphenix.protocol.utility.MinecraftReflection;
2728
import com.comphenix.protocol.utility.MinecraftVersion;
2829
import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
29-
import com.google.common.base.Objects;
3030

3131
/**
3232
* Represents an immutable PlayerInfoData in the PLAYER_INFO packet.
@@ -176,19 +176,19 @@ public boolean equals(Object obj) {
176176
if (obj instanceof PlayerInfoData) {
177177
PlayerInfoData other = (PlayerInfoData) obj;
178178
return profile.equals(other.profile) && latency == other.latency && gameMode == other.gameMode
179-
&& displayName.equals(other.displayName);
179+
&& Objects.equals(displayName, other.displayName);
180180
}
181181
return false;
182182
}
183183

184184
@Override
185185
public int hashCode() {
186-
return Objects.hashCode(latency, gameMode, profile, displayName);
186+
return Objects.hash(latency, gameMode, profile, displayName);
187187
}
188188

189189
@Override
190190
public String toString() {
191-
return String.format("PlayerInfoData[latency=%s, gameMode=%s, profile=%s, displayName=%s",
191+
return String.format("PlayerInfoData[latency=%s, gameMode=%s, profile=%s, displayName=%s]",
192192
latency, gameMode, profile, displayName);
193193
}
194194
}

0 commit comments

Comments
 (0)