fix: there is no need to synchronise chunk sending to the chunk GET i…

…nstance
IntellectualSites · Oct 14, 2023 · fa0f6e4 · fa0f6e4
1 parent 186d24b
commit fa0f6e4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java b/...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java
@@ -98,6 +98,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
     private final int maxHeight;
     private final int minSectionPosition;
     private final int maxSectionPosition;
+    private final Object sendLock = new Object();
     private LevelChunkSection[] sections;
     private LevelChunk levelChunk;
     private DataLayer[] blockLight;
@@ -841,8 +842,10 @@ private char[] loadPrivately(int layer) {
     }
 
     @Override
-    public synchronized void send(int mask, boolean lighting) {
-        PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+    public void send(int mask, boolean lighting) {
+        synchronized (sendLock) {
+            PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+        }
     }
 
     /**

diff --git a/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightGetBlocks.java b/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightGetBlocks.java
@@ -104,6 +104,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
     private final int maxSectionPosition;
     private final Registry<Biome> biomeRegistry;
     private final IdMap<Holder<Biome>> biomeHolderIdMap;
+    private final Object sendLock = new Object();
     private LevelChunkSection[] sections;
     private LevelChunk levelChunk;
     private DataLayer[] blockLight;
@@ -892,8 +893,10 @@ private char[] loadPrivately(int layer) {
     }
 
     @Override
-    public synchronized void send(int mask, boolean lighting) {
-        PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+    public void send(int mask, boolean lighting) {
+        synchronized (sendLock) {
+            PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+        }
     }
 
     /**

diff --git a/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightGetBlocks.java b/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightGetBlocks.java
@@ -104,6 +104,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
     private final int maxSectionPosition;
     private final Registry<Biome> biomeRegistry;
     private final IdMap<Holder<Biome>> biomeHolderIdMap;
+    private final Object sendLock = new Object();
     private LevelChunkSection[] sections;
     private LevelChunk levelChunk;
     private DataLayer[] blockLight;
@@ -892,8 +893,10 @@ private char[] loadPrivately(int layer) {
     }
 
     @Override
-    public synchronized void send(int mask, boolean lighting) {
-        PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+    public void send(int mask, boolean lighting) {
+        synchronized (sendLock) {
+            PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+        }
     }
 
     /**

diff --git a/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightGetBlocks.java b/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightGetBlocks.java
@@ -104,6 +104,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
     private final int maxSectionPosition;
     private final Registry<Biome> biomeRegistry;
     private final IdMap<Holder<Biome>> biomeHolderIdMap;
+    private final Object sendLock = new Object();
     private LevelChunkSection[] sections;
     private LevelChunk levelChunk;
     private DataLayer[] blockLight;
@@ -890,8 +891,10 @@ private char[] loadPrivately(int layer) {
     }
 
     @Override
-    public synchronized void send(int mask, boolean lighting) {
-        PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+    public void send(int mask, boolean lighting) {
+        synchronized (sendLock) {
+            PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+        }
     }
 
     /**

diff --git a/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java b/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java
@@ -83,6 +83,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
     private final int maxSectionPosition;
     private final Registry<Biome> biomeRegistry;
     private final IdMap<Holder<Biome>> biomeHolderIdMap;
+    private final Object sendLock = new Object();
     private LevelChunkSection[] sections;
     private LevelChunk levelChunk;
     private DataLayer[] blockLight;
@@ -869,8 +870,10 @@ private char[] loadPrivately(int layer) {
     }
 
     @Override
-    public synchronized void send(int mask, boolean lighting) {
-        PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+    public void send(int mask, boolean lighting) {
+        synchronized (sendLock) {
+            PaperweightPlatformAdapter.sendChunk(serverLevel, chunkX, chunkZ, lighting);
+        }
     }
 
     /**