From eb1393c02c84acf3cd1dec12f9b39ebff09dad6a Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 23 Jul 2022 14:24:31 -0700 Subject: [PATCH] Fix burnTime debug prints on mmodebug players --- .../nossr50/listeners/InventoryListener.java | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 95c4e4a81..2ac87e12a 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -54,36 +54,33 @@ public class InventoryListener implements Listener { } Furnace furnace = (Furnace) furnaceState; - OfflinePlayer offlinePlayer = mcMMO.getSmeltingTracker().getFurnaceOwner(furnace); + Player player; - if(offlinePlayer != null && offlinePlayer.isOnline()) { + if(offlinePlayer != null && offlinePlayer.isOnline() && offlinePlayer instanceof Player) { + player = (Player) offlinePlayer; - Player player = Bukkit.getPlayer(offlinePlayer.getUniqueId()); + if (!Permissions.isSubSkillEnabled(player, SubSkillType.SMELTING_FUEL_EFFICIENCY)) { + return; + } - if(player != null) { - if (!Permissions.isSubSkillEnabled(player, SubSkillType.SMELTING_FUEL_EFFICIENCY)) { - return; + McMMOPlayer mmoPlayer = UserManager.getPlayer(player); + + if(mmoPlayer != null) { + boolean debugMode = mmoPlayer.isDebugMode(); + + if(debugMode) { + player.sendMessage("FURNACE FUEL EFFICIENCY DEBUG REPORT"); + player.sendMessage("Furnace - "+furnace.hashCode()); + player.sendMessage("Furnace Type: "+furnaceBlock.getType()); + player.sendMessage("Burn Length before Fuel Efficiency is applied - "+event.getBurnTime()); } - McMMOPlayer mmoPlayer = UserManager.getPlayer(player); + event.setBurnTime(mmoPlayer.getSmeltingManager().fuelEfficiency(event.getBurnTime())); - if(mmoPlayer != null) { - boolean debugMode = player.isOnline() && mmoPlayer.isDebugMode(); - - if(debugMode) { - player.sendMessage("FURNACE FUEL EFFICIENCY DEBUG REPORT"); - player.sendMessage("Furnace - "+furnace.hashCode()); - player.sendMessage("Furnace Type: "+furnaceBlock.getType().toString()); - player.sendMessage("Burn Length before Fuel Efficiency is applied - "+event.getBurnTime()); - } - - event.setBurnTime(mmoPlayer.getSmeltingManager().fuelEfficiency(event.getBurnTime())); - - if(debugMode) { - player.sendMessage("New Furnace Burn Length (after applying fuel efficiency) "+event.getBurnTime()); - player.sendMessage(""); - } + if(debugMode) { + player.sendMessage("New Furnace Burn Length (after applying fuel efficiency) "+event.getBurnTime()); + player.sendMessage(""); } } }