Fix queue instantiation

boy0001 · Dec 26, 2017 · 994856b · 994856b
1 parent 1cb4cb3
commit 994856b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
@@ -36,6 +36,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -141,7 +142,7 @@ public void sendChunkUpdatePLIB(FaweChunk chunk, FawePlayer... players) {
     public boolean queueChunkLoad(int cx, int cz, RunnableVal<CHUNK> operation) {
         if (PAPER) {
             try {
-                getImpWorld().getChunkAtAsync(cx, cz, new World.ChunkLoadCallback() {
+                new PaperChunkCallback(getImpWorld(), cx, cz) {
                     @Override
                     public void onLoad(Chunk bukkitChunk) {
                         try {
@@ -155,7 +156,7 @@ public void onLoad(Chunk bukkitChunk) {
                             PAPER = false;
                         }
                     }
-                });
+                };
                 return true;
             } catch (Throwable ignore) {
                 PAPER = false;

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
@@ -56,17 +56,17 @@ public BukkitQueue_All(String world) {
     public boolean queueChunkLoad(int cx, int cz, RunnableVal<ChunkSnapshot> operation) {
         if (PAPER) {
             try {
-                getImpWorld().getChunkAtAsync(cx, cz, new World.ChunkLoadCallback() {
+                new PaperChunkCallback(getImpWorld(), cx, cz) {
                     @Override
                     public void onLoad(Chunk chunk) {
                         try {
                             ChunkSnapshot snapshot = chunk.getChunkSnapshot();
                             operation.run(snapshot);
                         } catch (Throwable e) {
-                            e.printStackTrace();
+                            PAPER = false;
                         }
                     }
-                });
+                };
                 return true;
             } catch (Throwable ignore) {
                 PAPER = false;

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/PaperChunkCallback.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/PaperChunkCallback.java
@@ -0,0 +1,12 @@
+package com.boydti.fawe.bukkit.v0;
+
+import org.bukkit.Chunk;
+import org.bukkit.World;
+
+public abstract class PaperChunkCallback {
+    public PaperChunkCallback(World world, int x, int z) {
+        world.getChunkAtAsync(x, z, chunk -> PaperChunkCallback.this.onLoad(chunk));
+    }
+
+    public abstract void onLoad(Chunk chunk);
+}