Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 10:37:57 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a few small bugs with Smelting.

Browse Source
This commit is contained in:
GJ 2013-02-28 17:32:36 -05:00
parent bbbba12e95
commit 13111a8d1b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
View File

@ -120,7 +120,7 @@ public class InventoryListener implements Listener{
} }
if (Permissions.skillEnabled(player, SkillType.SMELTING)) { 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 class InventoryListener implements Listener{
McMMOPlayer mcMMOPlayer = Users.getPlayer(event.getPlayer()); McMMOPlayer mcMMOPlayer = Users.getPlayer(event.getPlayer());
if (mcMMOPlayer.getPlayer().equals(plugin.getFurnacePlayer(furnaceBlock))) { 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()));
} }
} }
} }

7
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
View File

@ -96,14 +96,17 @@ public class SmeltingManager extends SkillManager {
return (int) (burnTime * burnModifier); return (int) (burnTime * burnModifier);
} }
public void smeltProcessing(Material resourceType, ItemStack result) { public ItemStack smeltProcessing(Material resourceType, ItemStack result) {
Player player = getPlayer(); Player player = getPlayer();
applyXpGain(Smelting.getResourceXp(resourceType)); applyXpGain(Smelting.getResourceXp(resourceType));
if (Permissions.doubleDrops(player, skill) && SkillTools.activationSuccessful(player, skill, Smelting.secondSmeltMaxChance, Smelting.secondSmeltMaxLevel)) { 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) { public int vanillaXPBoost(int experience) {