Add an extra check to projectile loading that ensures that the contai…

…ned item is still valid, in case something got scrambled.
SlimeKnights · May 10, 2015 · 6361efc · 6361efc
1 parent 291db56
commit 6361efc
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java
@@ -605,6 +605,11 @@ public void readEntityFromNBT(NBTTagCompound tags) {
         this.returnStack = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("Throwable"));
         onGround = tags.getByte("onGround") == 1;
         //doNotRetrieve = tags.getBoolean("Retrieval");
+
+        // ensure that nothing can crash because something went wrong in the world...
+        if(this.returnStack == null || !(this.returnStack.getItem() instanceof ToolCore)) {
+            this.setDead();
+        }
     }
 
     @Override