Remove crossbow ammo in case something invalid got loaded somehow (or…

… through remappings) #1278
SlimeKnights · Jan 1, 2015 · 28ccf12 · 28ccf12
1 parent 4b4627c
commit 28ccf12
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java
@@ -48,7 +48,15 @@ public ItemStack getLoadedAmmo(ItemStack itemStack)
         if(!isLoaded(tags))
             return null;
 
-        return ItemStack.loadItemStackFromNBT(tags.getCompoundTag("LoadedItem"));
+        ItemStack ammo = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("LoadedItem"));
+
+        // prevent crashes from remapping corruptions..
+        if(ammo != null && ammo.getItem() != null && ammo.getItem() != TinkerWeaponry.boltAmmo) {
+            tags.removeTag("LoadedItem");
+            ammo = null;
+        }
+
+        return ammo;
     }
 
     @Override