From 79f97a73091a6e3faabd9693257fc0c5f8256f0d Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Thu, 12 Mar 2015 07:36:41 +1100
Subject: [PATCH] Remove workaround as issue was fixed by spigot

---
 .../main/java/com/intellectualcrafters/plot/BukkitMain.java | 1 -
 .../java/com/intellectualcrafters/plot/PlotSquared.java     | 1 -
 .../com/intellectualcrafters/plot/object/PlotGenerator.java | 6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
index 7be1dfd13..ed1444b97 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
@@ -198,7 +198,6 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
 
     @Override
     final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
-        PlotSquared.GEN_WORLD = world;
         if (!PlotSquared.setupPlotWorld(world, id)) {
             return null;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
index edd471e5b..54e1bb439 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
@@ -72,7 +72,6 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 public class PlotSquared {
     public static final String MAIN_PERMISSION = "plots.use";
     public static final String ADMIN_PERMISSION = "plots.admin";
-    public static String GEN_WORLD = "__PLACEHOLDER__";
     public static File styleFile;
     public static YamlConfiguration style;
     public static File configFile;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
index c180663ef..3af8c37ce 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
@@ -35,9 +35,9 @@ public abstract class PlotGenerator extends ChunkGenerator {
     
     @Override
     public List<BlockPopulator> getDefaultPopulators(World world) {
-        PlotSquared.loadWorld(PlotSquared.GEN_WORLD, this);
+        PlotSquared.loadWorld(world.getName(), this);
 //        world = Bukkit.getWorld(PlotSquared.GEN_WORLD);
-        PlotWorld plotworld = PlotSquared.getPlotWorld(PlotSquared.GEN_WORLD);
+        PlotWorld plotworld = PlotSquared.getPlotWorld(world.getName());
         if (!plotworld.MOB_SPAWNING) {
             if (!plotworld.SPAWN_EGGS) {
                 world.setSpawnFlags(false, false);
@@ -54,7 +54,7 @@ public abstract class PlotGenerator extends ChunkGenerator {
             world.setMonsterSpawnLimit(-1);
             world.setWaterAnimalSpawnLimit(-1);
         }
-        return getPopulators(PlotSquared.GEN_WORLD);
+        return getPopulators(world.getName());
     }
     
     public abstract List<BlockPopulator> getPopulators(String world);