Fixed #33. This time in the right branch!

amadornes · May 22, 2016 · 91bb73d · 91bb73d
1 parent 0b66bc2
commit 91bb73d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/mcmultipart/block/TileMultipartContainer.java b/src/main/java/mcmultipart/block/TileMultipartContainer.java
@@ -131,7 +131,7 @@ public boolean occlusionTest(IMultipart part, IMultipart... ignored) {
     @Override
     public void onAddPartPre(IMultipart part) {
 
-        if (part instanceof ITickable && !(this instanceof ITickable)) {
+        if (getWorld() != null && part instanceof ITickable && !(this instanceof ITickable)) {
             getWorld().setBlockState(getPos(),
                     MCMultiPartMod.multipart.getDefaultState().withProperty(BlockMultipartContainer.PROPERTY_TICKING, true));
             TileEntity te = getWorld().getTileEntity(getPos());
@@ -152,7 +152,7 @@ public void onAddPartPost(IMultipart part) {
     @Override
     public void onRemovePartPre(IMultipart part) {
 
-        if (part instanceof ITickable && getParts().size() > 1) {
+        if (getWorld() != null && part instanceof ITickable && getParts().size() > 1) {
             boolean shouldTick = false;
             for (IMultipart p : getParts()) {
                 if (p != part && p instanceof ITickable) {