From 3c37a816175738e17ff74c3ccaee4a94b783e079 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 8 Sep 2015 13:32:55 -0700 Subject: [PATCH] Fix #816 Exception during loading Alveary Heater --- application.properties | 2 +- .../apiculture/gadgets/TileAlvearyClimatiser.java | 10 ++++++---- .../forestry/apiculture/gadgets/TileAlvearyPlain.java | 2 +- .../apiculture/gadgets/TileAlvearySwarmer.java | 2 +- .../java/forestry/apiculture/gadgets/TileBeehouse.java | 2 +- src/main/java/forestry/core/gadgets/Engine.java | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/application.properties b/application.properties index b842ac19b..569ae6f88 100644 --- a/application.properties +++ b/application.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.3.1370-1.7.10 version_major=3 version_minor=6 -version_patch=3 +version_patch=4 diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java index acdc58178..8ef5094a5 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java @@ -141,10 +141,12 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner this.active = active; - if (worldObj.isRemote) { - worldObj.func_147479_m(xCoord, yCoord, zCoord); - } else { - Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); + if (worldObj != null) { + if (worldObj.isRemote) { + worldObj.func_147479_m(xCoord, yCoord, zCoord); + } else { + Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); + } } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index c39597b5a..f9e5632da 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -155,7 +155,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB } this.active = active; - if (!worldObj.isRemote) { + if (worldObj != null && !worldObj.isRemote) { Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index 9ae809e2d..d94b2168a 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -229,7 +229,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, this.active = active; - if (!worldObj.isRemote) { + if (worldObj != null && !worldObj.isRemote) { Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index a864f50e9..c677e03bc 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -456,7 +456,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, } this.active = active; - if (!worldObj.isRemote) { + if (worldObj != null && !worldObj.isRemote) { Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); } } diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 5c5bb201f..804f790c8 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -172,7 +172,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection, IAct } this.active = active; - if (!worldObj.isRemote) { + if (worldObj != null && !worldObj.isRemote) { Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); } }