EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 16:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Should fix #209

Browse Source
This commit is contained in:
boy0001 2015-03-18 16:50:07 +11:00
parent 4d7cc990e2
commit fd39eb036d
3 changed files with 9 additions and 1 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

@ -272,6 +272,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
try { try {
BukkitSetBlockManager.setBlockManager = new SetBlockFast(); BukkitSetBlockManager.setBlockManager = new SetBlockFast();
} catch (final Throwable e) { } catch (final Throwable e) {
MainUtil.canSetFast = false;
BukkitSetBlockManager.setBlockManager = new SetBlockSlow(); BukkitSetBlockManager.setBlockManager = new SetBlockSlow();
} }
} }

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java
View File

@ -19,7 +19,9 @@ import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotManager;
import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PlotWorld;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.util.BlockUpdateUtil;
import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager; import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager;
import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager; import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager;
@ -187,7 +189,11 @@ public class AugmentedPopulator extends BlockPopulator {
} }
} }
for (final BlockPopulator populator : this.generator.getDefaultPopulators(world)) { for (final BlockPopulator populator : this.generator.getDefaultPopulators(world)) {
populator.populate(world, this.r, world.getChunkAt(X, Z)); Chunk chunk = world.getChunkAt(X, Z);
if (MainUtil.canSetFast) {
((BukkitSetBlockManager) BlockUpdateUtil.setBlockManager).update(Arrays.asList(chunk));
}
populator.populate(world, this.r, chunk);
} }
} }

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

@ -51,6 +51,7 @@ import com.intellectualcrafters.plot.util.bukkit.SendChunk;
public class MainUtil { public class MainUtil {
public final static HashMap<Plot, Integer> runners = new HashMap<>(); public final static HashMap<Plot, Integer> runners = new HashMap<>();
public static boolean canSendChunk = false; public static boolean canSendChunk = false;
public static boolean canSetFast = true;
public static ArrayList<String> runners_p = new ArrayList<>(); public static ArrayList<String> runners_p = new ArrayList<>();
static long state = 1; static long state = 1;
public static HashMap<String, PlotId> lastPlot = new HashMap<>(); public static HashMap<String, PlotId> lastPlot = new HashMap<>();