Fix VazkiiModsArchive#16

Pyrofab · Oct 1, 2019 · 38a95a3 · 38a95a3
1 parent f2b5a58
commit 38a95a3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/vazkii/potionfingers/ItemRing.java b/src/main/java/vazkii/potionfingers/ItemRing.java
@@ -107,24 +107,25 @@ 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;
 
 		IInventory inv = BaublesApi.getBaubles((EntityPlayer) player);
 		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)