From d8e5daf12bf711373cd24d7437e326143ddd77a2 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 23 Jul 2020 18:04:01 +0100
Subject: [PATCH 1/2] Fix missing Main->Chunk Util change

---
 .../com/plotsquared/bukkit/queue/BukkitLocalQueue.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
index fa6ccd69d..a1bf7bee7 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
@@ -29,7 +29,7 @@ import com.plotsquared.bukkit.schematic.StateWrapper;
 import com.plotsquared.bukkit.util.BukkitBlockUtil;
 import com.plotsquared.core.queue.BasicLocalBlockQueue;
 import com.plotsquared.core.util.BlockUtil;
-import com.plotsquared.core.util.MainUtil;
+import com.plotsquared.core.util.ChunkUtil;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
@@ -48,8 +48,8 @@ import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.data.BlockData;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 
@@ -125,9 +125,9 @@ public class BukkitLocalQueue extends BasicLocalBlockQueue {
                     for (int j = 0; j < blocksLayer.length; j++) {
                         if (blocksLayer[j] != null) {
                             BaseBlock block = blocksLayer[j];
-                            int x = MainUtil.x_loc[layer][j];
-                            int y = MainUtil.y_loc[layer][j];
-                            int z = MainUtil.z_loc[layer][j];
+                            int x = ChunkUtil.getX(j);
+                            int y = ChunkUtil.getY(layer, j);
+                            int z = ChunkUtil.getZ(j);
 
                             BlockData blockData = BukkitAdapter.adapt(block);
 

From 4d4f7556070a4aaacb471c4842a7a8f365698346 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 23 Jul 2020 18:06:14 +0100
Subject: [PATCH 2/2] 6.0.0-SUPER-SNAPSHOT

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index eacbc0fc2..806f85e47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,8 +30,8 @@ ext {
     git = Grgit.open(dir: new File(rootDir.toString() + "/.git"))
 }
 
-def ver = "5.12.5"
-def versuffix = ""
+def ver = "6.0.0"
+def versuffix = "SUPER-SNAPSHOT"
 ext {
     if (project.hasProperty("versionsuffix")) {
         versuffix = "-$versionsuffix"