Fix mob spawner entity data translation in 1.8->1.9

Closes #126
ViaVersion · Apr 29, 2024 · cb4ef9f · cb4ef9f
1 parent 459f403
commit cb4ef9f
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/...main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/WorldPackets1_9.java b/...main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/WorldPackets1_9.java
@@ -48,18 +48,17 @@ public static void register(Protocol1_8To1_9 protocol) {
 		protocol.registerClientbound(ClientboundPackets1_9.BLOCK_ENTITY_DATA, new PacketHandlers() {
 			@Override
 			public void register() {
-				map(Type.POSITION1_8);
-				map(Type.UNSIGNED_BYTE);
-				map(Type.NAMED_COMPOUND_TAG);
+				map(Type.POSITION1_8); // Position
+				map(Type.UNSIGNED_BYTE); // Action
+				map(Type.NAMED_COMPOUND_TAG); // Tag
 				handler(wrapper -> {
-					CompoundTag tag = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
-					if (tag != null && tag.contains("SpawnData")) {
-						CompoundTag spawnData = tag.get("SpawnData");
-						if (spawnData.contains("id")) {
-							String entity = (String) spawnData.get("id").getValue();
-							tag.remove("SpawnData");
-							tag.put("entityId", new StringTag(entity));
-						}
+					final CompoundTag tag = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
+
+					final CompoundTag spawnData = tag.remove("SpawnData");
+					if (spawnData != null && spawnData.contains("id")) {
+						final StringTag id = spawnData.remove("id");
+						if (id == null) return;
+						tag.put("EntityId", id);
 					}
 				});
 			}