Merge pull request #736 from tterrag1098/1.7

Fix some packet NPEs
This commit is contained in:
CrazyPants committed 2014-06-07 09:25:55 +08:00
commit 05a89a5cc3
2 files changed
+2 -2

No files matched your search

@@ -43,7 +43,7 @@ public class PacketCurrentTask extends MessageTileEntity<AbstractPoweredTaskEnti
@Override
public IMessage onMessage(PacketCurrentTask message, MessageContext ctx) {
AbstractPoweredTaskEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld());
if(message.nbtRoot.hasKey("currentTask")) {
if(tile != null && message.nbtRoot.hasKey("currentTask")) {
NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("currentTask");
tile.currentTask = PoweredTask.readFromNBT(message.nbtRoot.getCompoundTag("currentTask"));
} else {
@@ -45,7 +45,7 @@ public class PacketZombieTank extends MessageTileEntity<TileZombieGenerator> imp
public IMessage onMessage(PacketZombieTank message, MessageContext ctx) {
EntityPlayer player = EnderIO.proxy.getClientPlayer();
TileZombieGenerator tile = message.getTileEntity(player.worldObj);
if(message.nbtRoot.hasKey("tank")) {
if(tile != null && message.nbtRoot.hasKey("tank")) {
NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank");
tile.fuelTank.readFromNBT(tankRoot);
} else {