From 5d44e79e5b569e6cf7b0961eb0107fe9724836eb Mon Sep 17 00:00:00 2001 From: Robert S Date: Fri, 23 May 2014 00:35:55 -0400 Subject: [PATCH] Fixed an issue with conveyor belts failing to load from saves --- .../resonantinduction/mechanical/belt/TileConveyorBelt.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java index 1498822da..bc4a267a1 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java @@ -91,7 +91,7 @@ public class TileConveyorBelt extends TileBase implements IEntityConveyor, IRota // Sync the animation. Slant belts are slower. if (this.getBeltType() == BeltType.NORMAL || this.getBeltType() == BeltType.RAISED) - { + { if (this.animationFrame < 0) this.animationFrame = 0; if (this.animationFrame > MAX_FRAME) @@ -209,6 +209,7 @@ public class TileConveyorBelt extends TileBase implements IEntityConveyor, IRota slantType = BeltType.NORMAL; } this.slantType = slantType; - this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if (worldObj != null) + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } }