Fixed a few small bugs with Smelting.

mcMMO-Dev · Feb 28, 2013 · 13111a8 · 13111a8
1 parent bbbba12
commit 13111a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
@@ -120,7 +120,7 @@ public void onFurnaceSmeltEvent(FurnaceSmeltEvent event) {
                 }
 
                 if (Permissions.skillEnabled(player, SkillType.SMELTING)) {
-                    SkillManagerStore.getInstance().getSmeltingManager(player.getName()).smeltProcessing(event.getSource().getType(), event.getResult());
+                    event.setResult(SkillManagerStore.getInstance().getSmeltingManager(player.getName()).smeltProcessing(event.getSource().getType(), event.getResult()));
                 }
             }
         }
@@ -137,7 +137,7 @@ public void onFurnaceExtractEvent(FurnaceExtractEvent event) {
                 McMMOPlayer mcMMOPlayer = Users.getPlayer(event.getPlayer());
 
                 if (mcMMOPlayer.getPlayer().equals(plugin.getFurnacePlayer(furnaceBlock))) {
-                    SkillManagerStore.getInstance().getSmeltingManager(event.getPlayer().getName()).vanillaXPBoost(event.getExpToDrop());
+                    event.setExpToDrop(SkillManagerStore.getInstance().getSmeltingManager(event.getPlayer().getName()).vanillaXPBoost(event.getExpToDrop()));
                 }
             }
         }

diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
@@ -96,14 +96,17 @@ public int fuelEfficiency(int burnTime) {
         return (int) (burnTime * burnModifier);
     }
 
-    public void smeltProcessing(Material resourceType, ItemStack result) {
+    public ItemStack smeltProcessing(Material resourceType, ItemStack result) {
         Player player = getPlayer();
 
         applyXpGain(Smelting.getResourceXp(resourceType));
 
         if (Permissions.doubleDrops(player, skill) && SkillTools.activationSuccessful(player, skill, Smelting.secondSmeltMaxChance, Smelting.secondSmeltMaxLevel)) {
-            result.setAmount(result.getAmount() + 1);
+            ItemStack newResult = new ItemStack(result.getType(), result.getAmount() + 1);
+            return newResult;
         }
+
+        return result;
     }
 
     public int vanillaXPBoost(int experience) {