From 782d1e5df1890dd8f3a6db75326802037f33ffc2 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 21 Dec 2014 23:00:09 +0100 Subject: [PATCH] Fix crossbow checking body instead of string for enchanted bowstring #1237 --- src/main/java/tconstruct/weaponry/WeaponryHandler.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index d82da290bc0..9a9ac41d553 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -141,6 +141,8 @@ public void onProjectileWeaponCrafted(ToolCraftEvent.NormalTool event) BowMaterial bottom; BowstringMaterial string; + boolean enchanted = false; + if(event.tool instanceof BowBaseAmmo) { top = TConstructRegistry.getBowMaterial(tags.getInteger("Head")); bottom = TConstructRegistry.getBowMaterial(tags.getInteger("Accessory")); @@ -158,6 +160,9 @@ public void onProjectileWeaponCrafted(ToolCraftEvent.NormalTool event) drawSpeed *= 1.8f; flightSpeed *= 1.5f; } + + // enchanted bowstring + enchanted = tags.getInteger("Handle") == 1; } else if(event.tool instanceof Crossbow) { @@ -173,12 +178,15 @@ else if(event.tool instanceof Crossbow) // crossbows are stronk flightSpeed *= 1.5; + + // enchanted bowstring + enchanted = tags.getInteger("Accessory") == 1; } else return; // enchanted fabric - if (tags.getInteger("Handle") == 1) { + if (enchanted) { int modifiers = tags.getInteger("Modifiers"); modifiers += 1; tags.setInteger("Modifiers", modifiers);