From a968019799fcb0043fc83017919c20924c8104c0 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 23 Jan 2013 18:53:39 -0500 Subject: [PATCH] Rearrange order of listeners in attempt to fix errors on startup. --- src/main/java/com/gmail/nossr50/mcMMO.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index d7ecc8c48..3f84c215e 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -93,9 +93,9 @@ public class mcMMO extends JavaPlugin { private final PlayerListener playerListener = new PlayerListener(this); private final BlockListener blockListener = new BlockListener(this); private final EntityListener entityListener = new EntityListener(this); + private final InventoryListener inventoryListener = new InventoryListener(this); private final WorldListener worldListener = new WorldListener(); private final HardcoreListener hardcoreListener = new HardcoreListener(); - private final InventoryListener inventoryListener = new InventoryListener(this); private HashMap aliasMap = new HashMap(); //Alias - Command private HashMap tntTracker = new HashMap(); @@ -168,8 +168,9 @@ public class mcMMO extends JavaPlugin { pluginManager.registerEvents(playerListener, this); pluginManager.registerEvents(blockListener, this); pluginManager.registerEvents(entityListener, this); - pluginManager.registerEvents(worldListener, this); pluginManager.registerEvents(inventoryListener, this); + pluginManager.registerEvents(worldListener, this); + if (configInstance.getHardcoreEnabled()) { pluginManager.registerEvents(hardcoreListener, this);