Hotfix for NPE in spectator emulation

Fixed #462
ViaVersion · Oct 30, 2023 · ab4b927 · ab4b927
1 parent d8b3666
commit ab4b927
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/...n/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/PlayerPackets.java b/...n/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/PlayerPackets.java
@@ -210,7 +210,7 @@ public void register() {
 						Item[] equipment = new Item[4];
 						if (gameMode == 3) {
 							GameProfileStorage.GameProfile profile = wrapper.user().get(GameProfileStorage.class).get(myId);
-							equipment[3] = profile.getSkull();
+							equipment[3] = profile == null ? null : profile.getSkull();
 						} else {
 							for (int i = 0; i < equipment.length; i++) {
 								equipment[i] = playerSession.getPlayerEquipment(myId, i);

diff --git a/...a/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/storage/GameProfileStorage.java b/...a/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/storage/GameProfileStorage.java
@@ -43,14 +43,6 @@ public GameProfile put(UUID uuid, String name) {
 		return gameProfile;
 	}
 
-	public void putProperty(UUID uuid, Property property) {
-		properties.computeIfAbsent(uuid, profile -> new GameProfile(uuid, null)).properties.add(property);
-	}
-
-	public void putProperty(UUID uuid, String name, String value, String signature) {
-		putProperty(uuid, new Property(name, value, signature));
-	}
-
 	public GameProfile get(UUID uuid) {
 		return properties.get(uuid);
 	}