From 0b53f8266a379531f5df42e2c931cb3cb08be298 Mon Sep 17 00:00:00 2001 From: NuclearW Date: Fri, 8 Mar 2013 16:32:44 -0500 Subject: [PATCH] Squashed commit of the following: commit ba0ba3d2881dc672ef3dc40010278a0fbe158436 Author: NuclearW Date: Fri Mar 8 16:27:19 2013 -0500 Line endings, yo commit b93f0f54f5ec48b0a9e59da3b760603257cf0305 Author: md-5 Date: Sat Mar 9 08:18:49 2013 +1100 Use correct state, not block refrence to fix compile. commit 1063ad5c6823ebb46d75c777533ca26cd2d5f821 Author: md-5 Date: Sat Mar 9 08:12:34 2013 +1100 Fix errors in furnace listener. Bad GJ! --- .../gmail/nossr50/listeners/InventoryListener.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 8b4f7a2a6..94fd00cc4 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -94,7 +94,7 @@ public class InventoryListener implements Listener { BlockState furnaceState = furnaceBlock.getState(); if (furnaceState instanceof Furnace) { - ItemStack smelting = ((Furnace) furnaceBlock).getInventory().getSmelting(); + ItemStack smelting = ((Furnace) furnaceState).getInventory().getSmelting(); if (furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey) && smelting != null && ItemUtils.isSmeltable(smelting)) { // We can make this assumption because we (should) be the only ones using this exact metadata @@ -115,7 +115,7 @@ public class InventoryListener implements Listener { BlockState furnaceState = furnaceBlock.getState(); if (furnaceState instanceof Furnace) { - ItemStack smelting = ((Furnace) furnaceBlock).getInventory().getSmelting(); + ItemStack smelting = ((Furnace) furnaceState).getInventory().getSmelting(); if (furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey) && smelting != null && ItemUtils.isSmeltable(smelting)) { // We can make this assumption because we (should) be the only ones using this exact metadata @@ -132,14 +132,14 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onFurnaceExtractEvent(FurnaceExtractEvent event) { - BlockState furnaceBlock = event.getBlock().getState(); + BlockState furnaceState = event.getBlock().getState(); - if (furnaceBlock instanceof Furnace) { - ItemStack result = ((Furnace) furnaceBlock).getInventory().getResult(); + if (furnaceState instanceof Furnace) { + ItemStack result = ((Furnace) furnaceState).getInventory().getResult(); - if (furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey) && result != null && ItemUtils.isSmelted(result)) { + if (furnaceState.hasMetadata(mcMMO.furnaceMetadataKey) && result != null && ItemUtils.isSmelted(result)) { // We can make this assumption because we (should) be the only ones using this exact metadata - Player player = plugin.getServer().getPlayer(furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey).get(0).asString()); + Player player = plugin.getServer().getPlayer(furnaceState.getMetadata(mcMMO.furnaceMetadataKey).get(0).asString()); SmeltingManager smeltingManager = UserManager.getPlayer(player).getSmeltingManager();