Add support for BukkitForge using 'overworld' as the main world name.

2 files changed, 17 insertions, 8 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 014b4b9ea..fe443e2a4 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -208,4 +208,5 @@ v 2.0:
 	- Synchronize the raising of GroupManager events to Bukkit.getServer() (should prevent deadlocks).

 	- Synchronize pushing to Bukkit perms to prevent any ConcurrentModificationException.

 	- Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'.

-	- Negate 'groupmanager.noofflineperms' by default in the owner group.
\ No newline at end of file
+	- Negate 'groupmanager.noofflineperms' by default in the owner group.

+	- Add support for BukkitForge using 'overworld' as the main world name.
\ No newline at end of file
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);
 
 	}