Better checking of if we should be accessing data from super CharBloc…

…ks class Possibly addresses IntellectualSites/FastAsyncWorldEdit#1169
IntellectualSites · Aug 8, 2021 · 3f6df1a · 3f6df1a
1 parent 800eabd
commit 3f6df1a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 28 deletions.
diff --git a/...R2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_15_2.java b/...R2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_15_2.java
@@ -682,14 +682,18 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
         }
     }
 
-    private synchronized char[] loadPrivately(int layer) {
-        if (super.blocks[layer] != null) {
-            char[] blocks = new char[4096];
-            System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
-            return blocks;
-        } else {
-            return BukkitGetBlocks_1_15_2.this.update(layer, null, true);
+    private char[] loadPrivately(int layer) {
+        Section section = super.sections[layer];
+        if (super.sections[layer] != null) {
+            synchronized (section) {
+                if (super.sections[layer].isFull() && super.blocks[layer] != null) {
+                    char[] blocks = new char[4096];
+                    System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
+                    return blocks;
+                }
+            }
         }
+        return BukkitGetBlocks_1_15_2.this.update(layer, null, true);
     }
 
     @Override

diff --git a/...R3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_16_5.java b/...R3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_16_5.java
@@ -713,14 +713,18 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
         }
     }
 
-    private synchronized char[] loadPrivately(int layer) {
-        if (super.blocks[layer] != null) {
-            char[] blocks = new char[4096];
-            System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
-            return blocks;
-        } else {
-            return BukkitGetBlocks_1_16_5.this.update(layer, null, true);
+    private char[] loadPrivately(int layer) {
+        Section section = super.sections[layer];
+        if (super.sections[layer] != null) {
+            synchronized (section) {
+                if (super.sections[layer].isFull() && super.blocks[layer] != null) {
+                    char[] blocks = new char[4096];
+                    System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
+                    return blocks;
+                }
+            }
         }
+        return BukkitGetBlocks_1_16_5.this.update(layer, null, true);
     }
 
     @Override

diff --git a/...7_R1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_17.java b/...7_R1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_17.java
@@ -715,14 +715,18 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
         }
     }
 
-    private synchronized char[] loadPrivately(int layer) {
-        if (super.blocks[layer] != null) {
-            char[] blocks = new char[4096];
-            System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
-            return blocks;
-        } else {
-            return BukkitGetBlocks_1_17.this.update(layer, null, true);
+    private char[] loadPrivately(int layer) {
+        Section section = super.sections[layer];
+        if (super.sections[layer] != null) {
+            synchronized (section) {
+                if (super.sections[layer].isFull() && super.blocks[layer] != null) {
+                    char[] blocks = new char[4096];
+                    System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
+                    return blocks;
+                }
+            }
         }
+        return BukkitGetBlocks_1_17.this.update(layer, null, true);
     }
 
     @Override

diff --git a/..._2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_17_1.java b/..._2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_17_1.java
@@ -715,14 +715,18 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
         }
     }
 
-    private synchronized char[] loadPrivately(int layer) {
-        if (super.blocks[layer] != null) {
-            char[] blocks = new char[4096];
-            System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
-            return blocks;
-        } else {
-            return BukkitGetBlocks_1_17_1.this.update(layer, null, true);
+    private char[] loadPrivately(int layer) {
+        Section section = super.sections[layer];
+        if (super.sections[layer] != null) {
+            synchronized (section) {
+                if (super.sections[layer].isFull() && super.blocks[layer] != null) {
+                    char[] blocks = new char[4096];
+                    System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
+                    return blocks;
+                }
+            }
         }
+        return BukkitGetBlocks_1_17_1.this.update(layer, null, true);
     }
 
     @Override