From cd4936f6c123eaf41641a7c945fe9f1406c109a4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:18:34 +0000 Subject: [PATCH] Fixed botania armor models not resetting the "using a bow" state. Closes #1569 --- .../botania/client/model/armor/ModelArmorElementium.java | 1 + .../vazkii/botania/client/model/armor/ModelArmorManasteel.java | 3 ++- .../vazkii/botania/client/model/armor/ModelArmorManaweave.java | 1 + .../botania/client/model/armor/ModelArmorTerrasteel.java | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 5f6e67bfc..dd5e30f10 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -246,6 +246,7 @@ public class ModelArmorElementium extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index c468620ec..aca2b67fc 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -175,12 +175,13 @@ public class ModelArmorManasteel extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); if (enumaction == EnumAction.block) heldItemRight = 3; - else if (enumaction == EnumAction.bow) + else if(enumaction == EnumAction.bow) aimedBow = true; } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 62f47c178..657836e3d 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -176,6 +176,7 @@ public class ModelArmorManaweave extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 70d840f3e..0215345f0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -267,6 +267,7 @@ public class ModelArmorTerrasteel extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction();