From f6e492638df8a8c210f321caac4325929c1cd201 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Sun, 5 May 2019 16:56:00 +0100 Subject: [PATCH] Bad temporary fix for #2345 - just don't use BukkitLocalQueue#regenChunkSafe and that on 1.14 :) (: --- .../plotsquared/bukkit/util/BukkitChunkManager.java | 3 ++- .../plotsquared/plot/generator/HybridPlotManager.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java index 7dcbc5add..744f4b6e9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java @@ -275,7 +275,8 @@ public class BukkitChunkManager extends ChunkManager { continue; } final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false); - if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) { + if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z + && PlotSquared.imp().getServerVersion()[1] == 13) { AugmentedUtils .bypass(ignoreAugment, () -> queue.regenChunkSafe(chunk.x, chunk.z)); continue; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java index 10e7c1a8d..4796e3644 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java @@ -180,7 +180,7 @@ public class HybridPlotManager extends ClassicPlotManager { ChunkManager.chunkTask(pos1, pos2, new RunnableVal() { @Override public void run(int[] value) { // If the chunk isn't near the edge and it isn't an augmented world we can just regen the whole chunk - if (canRegen && (value[6] == 0)) { + if (canRegen && (value[6] == 0) && PlotSquared.imp().getServerVersion()[1] == 13) { queue.regenChunk(value[0], value[1]); return; }