diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-01-31 20:38:36 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-01-31 20:38:36 +0000 |
| commit | fddbd7a52a828a3b34af185492bb4e70c3aabba3 (patch) | |
| tree | 94c897a7caf403eb0ef313ab8efd6819675563c8 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | |
| parent | 360e3e8801622cd1d80bae9a6bb766a9d18aaea4 (diff) | |
| parent | df0ccb58329de6a65c786996fdd70ec173846eaf (diff) | |
| download | Essentials-fddbd7a52a828a3b34af185492bb4e70c3aabba3.tar Essentials-fddbd7a52a828a3b34af185492bb4e70c3aabba3.tar.gz Essentials-fddbd7a52a828a3b34af185492bb4e70c3aabba3.tar.lz Essentials-fddbd7a52a828a3b34af185492bb4e70c3aabba3.tar.xz Essentials-fddbd7a52a828a3b34af185492bb4e70c3aabba3.zip | |
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Conflicts:
EssentialsGroupManager/src/Changelog.txt
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 12a6a5150..2661c6bc0 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -477,14 +477,22 @@ public class WorldsHolder { private void verifyFirstRun() { - Properties server = new Properties(); - try { - server.load(new FileInputStream(new File("server.properties"))); - serverDefaultWorldName = server.getProperty("level-name").toLowerCase(); - setupWorldFolder(serverDefaultWorldName); - } catch (IOException ex) { - GroupManager.logger.log(Level.SEVERE, null, ex); + /* Do not use the folder name if this + * is a Bukkit Forge server. + */ + if (plugin.getServer().getName().equalsIgnoreCase("BukkitForge")) { + serverDefaultWorldName = "overworld"; + + } else { + Properties server = new Properties(); + try { + server.load(new FileInputStream(new File("server.properties"))); + serverDefaultWorldName = server.getProperty("level-name").toLowerCase(); + } catch (IOException ex) { + GroupManager.logger.log(Level.SEVERE, null, ex); + } } + setupWorldFolder(serverDefaultWorldName); } |