Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-03 14:01:37 +01:00
Code Issues Projects Releases Wiki Activity

Don't try to use the worldHolder before it's initialised.

Browse Source
This commit is contained in:
ElgarL 2013-02-22 12:59:50 +00:00
parent 90730f63d5
commit 8960417d56
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
View File

@ -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<String, OverloadedWorldHolder>();
@ -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);
}

2
EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java
View File

@ -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");