Prevented NPE when moving watched Objects to DataWatcher

This commit is contained in:
CrushedPixel
2015-05-24 13:05:52 +02:00
parent 4398d96326
commit b759d282f2

View File

@@ -98,18 +98,22 @@ public class PacketListener extends DataListener {
if(packet instanceof S0FPacketSpawnMob) { if(packet instanceof S0FPacketSpawnMob) {
S0FPacketSpawnMob p = (S0FPacketSpawnMob) packet; S0FPacketSpawnMob p = (S0FPacketSpawnMob) packet;
p.field_149043_l = new DataWatcher(null); p.field_149043_l = new DataWatcher(null);
for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>)p.func_149027_c()) { if(p.func_149027_c() != null) {
for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>) p.func_149027_c()) {
p.field_149043_l.addObject(wo.getDataValueId(), wo.getObject()); p.field_149043_l.addObject(wo.getDataValueId(), wo.getObject());
} }
} }
}
if(packet instanceof S0CPacketSpawnPlayer) { if(packet instanceof S0CPacketSpawnPlayer) {
S0CPacketSpawnPlayer p = (S0CPacketSpawnPlayer) packet; S0CPacketSpawnPlayer p = (S0CPacketSpawnPlayer) packet;
p.field_148960_i = new DataWatcher(null); p.field_148960_i = new DataWatcher(null);
for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>)p.func_148944_c()) { if(p.func_148944_c() != null) {
for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>) p.func_148944_c()) {
p.field_148960_i.addObject(wo.getDataValueId(), wo.getObject()); p.field_148960_i.addObject(wo.getDataValueId(), wo.getObject());
} }
} }
}
byte[] array = ReplayFileIO.serializePacket(packet); byte[] array = ReplayFileIO.serializePacket(packet);