From c83d011faab87d33d636128faa16cc0d08f087a6 Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Tue, 15 May 2018 19:40:48 -0700
Subject: [PATCH] Don't convert raw salmon to raw fish when summoning ocelots.

Fixes #3366
---
 .../java/com/gmail/nossr50/skills/taming/TamingManager.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
index e8ccaf9af..507492969 100644
--- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
@@ -312,7 +312,9 @@ public class TamingManager extends SkillManager {
             ParticleEffectUtils.playCallOfTheWildEffect(entity);
         }
 
-        player.getInventory().setItemInMainHand(heldItemAmount == summonAmount ? null : new ItemStack(heldItem.getType(), heldItemAmount - summonAmount));
+        ItemStack leftovers = new ItemStack(heldItem);
+        leftovers.setAmount(heldItemAmount - summonAmount);
+        player.getInventory().setItemInMainHand(heldItemAmount == summonAmount ? null : leftovers);
 
         String lifeSpan = "";
         if (tamingCOTWLength > 0) {