EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Remove workaround as issue was fixed by spigot

Browse Source
This commit is contained in:
boy0001 2015-03-12 07:36:41 +11:00
parent a32c3067c5
commit 79f97a7309
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
View File

@ -198,7 +198,6 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@Override @Override
final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) { final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
PlotSquared.GEN_WORLD = world;
if (!PlotSquared.setupPlotWorld(world, id)) { if (!PlotSquared.setupPlotWorld(world, id)) {
return null; return null;
} }

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
View File

@ -72,7 +72,6 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
public class PlotSquared { public class PlotSquared {
public static final String MAIN_PERMISSION = "plots.use"; public static final String MAIN_PERMISSION = "plots.use";
public static final String ADMIN_PERMISSION = "plots.admin"; public static final String ADMIN_PERMISSION = "plots.admin";
public static String GEN_WORLD = "__PLACEHOLDER__";
public static File styleFile; public static File styleFile;
public static YamlConfiguration style; public static YamlConfiguration style;
public static File configFile; public static File configFile;

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
View File

@ -35,9 +35,9 @@ public abstract class PlotGenerator extends ChunkGenerator {
@Override @Override
public List<BlockPopulator> getDefaultPopulators(World world) { public List<BlockPopulator> getDefaultPopulators(World world) {
PlotSquared.loadWorld(PlotSquared.GEN_WORLD, this); PlotSquared.loadWorld(world.getName(), this);
// world = Bukkit.getWorld(PlotSquared.GEN_WORLD); // 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.MOB_SPAWNING) {
if (!plotworld.SPAWN_EGGS) { if (!plotworld.SPAWN_EGGS) {
world.setSpawnFlags(false, false); world.setSpawnFlags(false, false);
@ -54,7 +54,7 @@ public abstract class PlotGenerator extends ChunkGenerator {
world.setMonsterSpawnLimit(-1); world.setMonsterSpawnLimit(-1);
world.setWaterAnimalSpawnLimit(-1); world.setWaterAnimalSpawnLimit(-1);
} }
return getPopulators(PlotSquared.GEN_WORLD); return getPopulators(world.getName());
} }
public abstract List<BlockPopulator> getPopulators(String world); public abstract List<BlockPopulator> getPopulators(String world);