From 38a95a36a30df8498a1106c8ddfb0ff002db1b10 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Mon, 23 Sep 2019 20:19:54 +0200 Subject: [PATCH] Fix Vazkii/PotionFingers#16 --- src/main/java/vazkii/potionfingers/ItemRing.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/potionfingers/ItemRing.java b/src/main/java/vazkii/potionfingers/ItemRing.java index f95e5dc..81509d6 100644 --- a/src/main/java/vazkii/potionfingers/ItemRing.java +++ b/src/main/java/vazkii/potionfingers/ItemRing.java @@ -107,15 +107,16 @@ public int getColorFromItemstack(ItemStack stack, int i) { @Override public void onEquipped(ItemStack itemstack, EntityLivingBase player) { - updatePotionStatus(player, getPotion(itemstack)); + updatePotionStatus(player, itemstack, false); } @Override public void onUnequipped(ItemStack itemstack, EntityLivingBase player) { - updatePotionStatus(player, getPotion(itemstack)); + updatePotionStatus(player, itemstack, true); } - public void updatePotionStatus(EntityLivingBase player, Potion potion) { + public void updatePotionStatus(EntityLivingBase player, ItemStack ring, boolean unequipping) { + Potion potion = getPotion(ring); if(potion == null || !(player instanceof EntityPlayer)) return; @@ -123,8 +124,8 @@ public void updatePotionStatus(EntityLivingBase player, Potion potion) { ItemStack ring1 = inv.getStackInSlot(1); ItemStack ring2 = inv.getStackInSlot(2); - Potion potion1 = getPotion(ring1); - Potion potion2 = getPotion(ring2); + Potion potion1 = unequipping && ring == ring1 ? null : getPotion(ring1); + Potion potion2 = unequipping && ring == ring2 ? null : getPotion(ring2); int level = -1; if(potion1 == potion)