From 806b324d8132202fe5dfd652c0c307e67b009bd9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 11 Oct 2016 23:40:48 +0100 Subject: [PATCH] Fixed some baubles not working after their slots were changed. --- .../java/vazkii/botania/client/core/handler/HUDHandler.java | 6 +++--- .../botania/common/item/equipment/bauble/ItemDivaCharm.java | 2 +- .../common/item/equipment/bauble/ItemFlightTiara.java | 4 ++-- .../common/item/equipment/bauble/ItemGoldenLaurel.java | 2 +- .../botania/common/item/equipment/bauble/ItemHolyCloak.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 7f78602da..592c40973 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -89,10 +89,10 @@ public final class HUDHandler { if(event.getType() == ElementType.HEALTH) { profiler.startSection("botania-hud"); IInventory baublesInv = BaublesApi.getBaubles(mc.thePlayer); - ItemStack amulet = baublesInv.getStackInSlot(0); - if(amulet != null && amulet.getItem() == ModItems.flightTiara) { + ItemStack headpiece = baublesInv.getStackInSlot(4); + if(headpiece != null && headpiece.getItem() == ModItems.flightTiara) { profiler.startSection("flugelTiara"); - ItemFlightTiara.renderHUD(event.getResolution(), mc.thePlayer, amulet); + ItemFlightTiara.renderHUD(event.getResolution(), mc.thePlayer, headpiece); profiler.endSection(); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index e93fb2ea7..c5401aa5a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -54,7 +54,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble public void onEntityDamaged(LivingHurtEvent event) { if(event.getSource().getEntity() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().worldObj.isRemote && Math.random() < 0.6F) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); - ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(0); + ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(6); if(amulet != null && amulet.getItem() == this) { final int cost = 250; if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index cd7aae0d4..13e19ee6b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -213,7 +213,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub public void updatePlayerFlyStatus(LivingUpdateEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack tiara = BaublesApi.getBaubles(player).getStackInSlot(0); + ItemStack tiara = BaublesApi.getBaubles(player).getStackInSlot(4); int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); if(playersWithFlight.contains(playerStr(player))) { @@ -311,7 +311,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } private boolean shouldPlayerHaveFlight(EntityPlayer player) { - ItemStack armor = BaublesApi.getBaubles(player).getStackInSlot(0); + ItemStack armor = BaublesApi.getBaubles(player).getStackInSlot(4); if(armor != null && armor.getItem() == this) { int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index a43edf251..ed3fd8525 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -44,7 +44,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { public void onPlayerDeath(LivingDeathEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(0); + ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(4); if(amulet != null && amulet.getItem() == this) { event.setCanceled(true); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 09e83b08b..9b3301891 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -60,7 +60,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); IInventory baubles = BaublesApi.getBaubles(player); - ItemStack belt = baubles.getStackInSlot(3); + ItemStack belt = baubles.getStackInSlot(5); if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); int cooldown = getCooldown(belt);