From 5f78f312a1757bf5a47d90b08bfc0b927c6e77d4 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Mon, 25 May 2015 22:54:12 +0200 Subject: [PATCH] Prevented NPEs in PacketSpawnMob and PacketSpawnPlayer by inserting dummy values. This is okay since the Datawatcher has no impact on the Replay anyway. --- .../crushedpixel/replaymod/recording/PacketListener.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java b/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java index 4a9983ff..f9023d20 100755 --- a/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java +++ b/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java @@ -13,7 +13,6 @@ import net.minecraft.network.play.server.S0FPacketSpawnMob; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.List; import java.util.UUID; public class PacketListener extends DataListener { @@ -98,21 +97,27 @@ public class PacketListener extends DataListener { if(packet instanceof S0FPacketSpawnMob) { S0FPacketSpawnMob p = (S0FPacketSpawnMob) packet; p.field_149043_l = new DataWatcher(null); + p.field_149043_l.addObject(0, (byte)0); + /* if(p.func_149027_c() != null) { for(DataWatcher.WatchableObject wo : (List) p.func_149027_c()) { p.field_149043_l.addObject(wo.getDataValueId(), wo.getObject()); } } + */ } if(packet instanceof S0CPacketSpawnPlayer) { S0CPacketSpawnPlayer p = (S0CPacketSpawnPlayer) packet; p.field_148960_i = new DataWatcher(null); + p.field_148960_i.addObject(0, (byte)0); + /* if(p.func_148944_c() != null) { for(DataWatcher.WatchableObject wo : (List) p.func_148944_c()) { p.field_148960_i.addObject(wo.getDataValueId(), wo.getObject()); } } + */ }