From 024aa995f6e78404afaaf635a3ee5cf0d0ffdf28 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sun, 10 May 2015 13:17:10 +1000 Subject: [PATCH] Secondary world loading --- .../plot/object/PlotGenerator.java | 127 ++++++++++-------- 1 file changed, 71 insertions(+), 56 deletions(-) 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 e0a8e9868..a631e41e6 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java @@ -20,6 +20,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.object; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; @@ -31,12 +32,12 @@ import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.PlotSquared; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; import com.intellectualcrafters.plot.listeners.WorldEvents; import com.intellectualcrafters.plot.util.ChunkManager; public abstract class PlotGenerator extends ChunkGenerator { + private boolean loaded = false; private short[][] result; public int X; public int Z; @@ -49,73 +50,87 @@ public abstract class PlotGenerator extends ChunkGenerator { @SuppressWarnings("unchecked") @Override public List getDefaultPopulators(World world) { - PlotSquared.loadWorld(WorldEvents.getName(world), this); - PlotWorld plotworld = PlotSquared.getPlotWorld(WorldEvents.getName(world)); - if (!plotworld.MOB_SPAWNING) { - if (!plotworld.SPAWN_EGGS) { - world.setSpawnFlags(false, false); + try { + if (!loaded) { + PlotSquared.loadWorld(WorldEvents.getName(world), this); + PlotWorld plotworld = PlotSquared.getPlotWorld(WorldEvents.getName(world)); + if (!plotworld.MOB_SPAWNING) { + if (!plotworld.SPAWN_EGGS) { + world.setSpawnFlags(false, false); + } + world.setAmbientSpawnLimit(0); + world.setAnimalSpawnLimit(0); + world.setMonsterSpawnLimit(0); + world.setWaterAnimalSpawnLimit(0); + } + else { + world.setSpawnFlags(true, true); + world.setAmbientSpawnLimit(-1); + world.setAnimalSpawnLimit(-1); + world.setMonsterSpawnLimit(-1); + world.setWaterAnimalSpawnLimit(-1); + } + loaded = true; + return (List)(List) getPopulators(WorldEvents.getName(world)); } - world.setAmbientSpawnLimit(0); - world.setAnimalSpawnLimit(0); - world.setMonsterSpawnLimit(0); - world.setWaterAnimalSpawnLimit(0); } - else { - world.setSpawnFlags(true, true); - world.setAmbientSpawnLimit(-1); - world.setAnimalSpawnLimit(-1); - world.setMonsterSpawnLimit(-1); - world.setWaterAnimalSpawnLimit(-1); + catch (Exception e) { + e.printStackTrace(); } - return (List)(List) getPopulators(WorldEvents.getName(world)); + return new ArrayList(); } @Override public short[][] generateExtBlockSections(World world, Random r, int cx, int cz, BiomeGrid biomes) { - final int prime = 13; - int h = 1; - h = (prime * h) + cx; - h = (prime * h) + cz; - this.random.state = h; - this.result = new short[16][]; - PlotWorld plotworld = PlotSquared.getPlotWorld(world.getName()); - if (plotworld == null) { - plotworld = getNewPlotWorld(world.getName()); - PlotSquared.addPlotWorld(world.getName(), plotworld, getPlotManager()); - } - Biome biome = Biome.valueOf(plotworld.PLOT_BIOME); - this.X = cx << 4; - this.Z = cz << 4; - if (ChunkManager.FORCE_PASTE) { - for (short x = 0; x < 16; x++) { - for (short z = 0; z < 16; z++) { - if (biomes != null) { - biomes.setBiome(x, z, biome); + try { + if (!loaded) { + PlotSquared.loadWorld(WorldEvents.getName(world), this); + loaded = true; + } + final int prime = 13; + int h = 1; + h = (prime * h) + cx; + h = (prime * h) + cz; + this.random.state = h; + this.result = new short[16][]; + this.X = cx << 4; + this.Z = cz << 4; + if (ChunkManager.FORCE_PASTE) { + PlotWorld plotworld = PlotSquared.getPlotWorld(world.getName()); + Biome biome = Biome.valueOf(plotworld.PLOT_BIOME); + for (short x = 0; x < 16; x++) { + for (short z = 0; z < 16; z++) { + if (biomes != null) { + biomes.setBiome(x, z, biome); + } + final PlotLoc loc = new PlotLoc((X + x), (Z + z)); + final HashMap blocks = ChunkManager.GENERATE_BLOCKS.get(loc); + for (final Entry entry : blocks.entrySet()) { + setBlock(x, entry.getKey(), z, entry.getValue()); + } } - final PlotLoc loc = new PlotLoc((X + x), (Z + z)); - final HashMap blocks = ChunkManager.GENERATE_BLOCKS.get(loc); - for (final Entry entry : blocks.entrySet()) { - setBlock(x, entry.getKey(), z, entry.getValue()); + } + return this.result; + } + generateChunk(world, ChunkManager.CURRENT_PLOT_CLEAR, random, cx, cz, biomes); + if (ChunkManager.CURRENT_PLOT_CLEAR != null) { + PlotLoc loc; + for (Entry> entry : ChunkManager.GENERATE_BLOCKS.entrySet()) { + for (Entry entry2 : entry.getValue().entrySet()) { + loc = entry.getKey(); + int xx = loc.x - X; + int zz = loc.z - Z; + if (xx >= 0 && xx < 16) { + if (zz >= 0 && zz < 16) { + setBlock(xx, entry2.getKey(), zz, entry2.getValue()); + } + } } } } - return this.result; } - generateChunk(world, ChunkManager.CURRENT_PLOT_CLEAR, random, cx, cz, biomes); - if (ChunkManager.CURRENT_PLOT_CLEAR != null) { - PlotLoc loc; - for (Entry> entry : ChunkManager.GENERATE_BLOCKS.entrySet()) { - for (Entry entry2 : entry.getValue().entrySet()) { - loc = entry.getKey(); - int xx = loc.x - X; - int zz = loc.z - Z; - if (xx >= 0 && xx < 16) { - if (zz >= 0 && zz < 16) { - setBlock(xx, entry2.getKey(), zz, entry2.getValue()); - } - } - } - } + catch (Exception e) { + e.printStackTrace(); } return result; }