From 65251ade16f195e3d125aff56dfd7c4bef5acfe8 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Fri, 22 Feb 2013 12:59:50 +0000 Subject: Don't try to use the worldHolder before it's initialised. --- .../groupmanager/dataholder/worlds/WorldsHolder.java | 15 ++++++++++----- .../anjocaido/groupmanager/events/GMWorldListener.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 0dc9a63e9..2553b3bc3 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -76,6 +76,11 @@ public class WorldsHolder { return mirrorsUser; } + public boolean isWorldKnown(String name) { + + return worldsData.containsKey(name.toLowerCase()); + } + public void resetWorldsHolder() { worldsData = new HashMap(); @@ -116,16 +121,16 @@ public class WorldsHolder { GroupManager.logger.log(Level.FINE, "Checking data for " + world.getName() + "."); if ((!worldsData.containsKey(world.getName().toLowerCase())) && ((!mirrorsGroup.containsKey(world.getName().toLowerCase())) || (!mirrorsUser.containsKey(world.getName().toLowerCase())))) { - if (plugin.getWorldsHolder().getWorldData("all_unnamed_worlds") != null) { + if (worldsData.containsKey("all_unnamed_worlds")) { - String usersMirror = plugin.getWorldsHolder().getMirrorsUser().get("all_unnamed_worlds"); - String groupsMirror = plugin.getWorldsHolder().getMirrorsGroup().get("all_unnamed_worlds"); + String usersMirror = mirrorsUser.get("all_unnamed_worlds"); + String groupsMirror = mirrorsGroup.get("all_unnamed_worlds"); if (usersMirror != null) - plugin.getWorldsHolder().getMirrorsUser().put(world.getName().toLowerCase(), usersMirror); + mirrorsUser.put(world.getName().toLowerCase(), usersMirror); if (groupsMirror != null) - plugin.getWorldsHolder().getMirrorsGroup().put(world.getName().toLowerCase(), groupsMirror); + mirrorsGroup.put(world.getName().toLowerCase(), groupsMirror); } diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java index f89a70c4a..51937bd67 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java @@ -36,7 +36,7 @@ public class GMWorldListener implements Listener { GroupManager.logger.info("New world detected..."); GroupManager.logger.info("Creating data for: " + worldName); - if (plugin.getWorldsHolder().getWorldData("all_unnamed_worlds") != null) { + if (plugin.getWorldsHolder().isWorldKnown("all_unnamed_worlds")) { String usersMirror = plugin.getWorldsHolder().getMirrorsUser().get("all_unnamed_worlds"); String groupsMirror = plugin.getWorldsHolder().getMirrorsGroup().get("all_unnamed_worlds"); -- cgit v1.2.3