From 28ccf1236eb2e328e6287972eb99b6bf25ea6f1b Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Thu, 1 Jan 2015 22:19:15 +0100 Subject: [PATCH] Remove crossbow ammo in case something invalid got loaded somehow (or through remappings) #1278 --- .../java/tconstruct/weaponry/weapons/Crossbow.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 3d7f3c90..9588b824 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -48,7 +48,15 @@ public class Crossbow extends ProjectileWeapon { 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