Switch from chunk to block notification.

Individual blocks need to be destroyed because complete chunks may not be used.
BentoBoxWorld · Dec 24, 2023 · 513851d · 513851d
1 parent b7c7883
commit 513851d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/hooks/SlimefunHook.java b/src/main/java/world/bentobox/bentobox/hooks/SlimefunHook.java
@@ -4,6 +4,7 @@
 package world.bentobox.bentobox.hooks;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -46,5 +47,9 @@ public void clearBlockInfo(Block b, boolean destroy) {
         BlockStorage.clearBlockInfo(b, destroy);
     }
 
+    public void clearBlockInfo(Location location, boolean destroy) {
+        BlockStorage.clearBlockInfo(location, destroy);
+    }
+
 
 }
diff --git a/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java b/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java
@@ -119,10 +119,6 @@ public CompletableFuture<Void> regenerateChunk(Chunk chunk) {
 
     private CompletableFuture<Void> regenerateChunk(@Nullable IslandDeletion di, World world, int chunkX, int chunkZ) {
 
-        // Notify Slimefun
-        plugin.getHooks().getHook("Slimefun")
-                .ifPresent(sf -> ((SlimefunHook) sf).clearAllBlockInfoAtChunk(world, chunkX, chunkZ, true));
-
         CompletableFuture<Chunk> seedWorldFuture = getSeedWorldChunk(world, chunkX, chunkZ);
 
         // Set up a future to get the chunk requests using Paper's Lib. If Paper is used, this should be done async
@@ -198,6 +194,10 @@ private void copyChunkDataToChunk(Chunk toChunk, Chunk fromChunk, BoundingBox li
                     if (x % 4 == 0 && y % 4 == 0 && z % 4 == 0) {
                         toChunk.getBlock(x, y, z).setBiome(fromChunk.getBlock(x, y, z).getBiome());
                     }
+                    // Delete any slimefun blocks
+                    Location loc = new Location(toChunk.getWorld(), baseX + x, y, baseZ + z);
+                    plugin.getHooks().getHook("Slimefun")
+                            .ifPresent(sf -> ((SlimefunHook) sf).clearBlockInfo(loc, true));
                 }
             }
         }

diff --git a/src/main/java/world/bentobox/bentobox/nms/SimpleWorldRegenerator.java b/src/main/java/world/bentobox/bentobox/nms/SimpleWorldRegenerator.java
@@ -7,6 +7,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.bukkit.Chunk;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Entity;
@@ -91,10 +92,6 @@ private boolean isEnded(int chunkX) {
 
     @SuppressWarnings("deprecation")
     private CompletableFuture<Void> regenerateChunk(GameModeAddon gm, IslandDeletion di, World world, int chunkX, int chunkZ) {
-        // Notify Slimefun
-        plugin.getHooks().getHook("Slimefun")
-                .ifPresent(sf -> ((SlimefunHook) sf).clearAllBlockInfoAtChunk(world, chunkX, chunkZ, true));
-
         CompletableFuture<Chunk> chunkFuture = PaperLib.getChunkAtAsync(world, chunkX, chunkZ);
         CompletableFuture<Void> invFuture = chunkFuture.thenAccept(chunk ->
         Arrays.stream(chunk.getTileEntities()).filter(InventoryHolder.class::isInstance)
@@ -145,6 +142,10 @@ private void copyChunkDataToChunk(Chunk chunk, ChunkGenerator.ChunkData chunkDat
                     if (x % 4 == 0 && y % 4 == 0 && z % 4 == 0) {
                         chunk.getBlock(x, y, z).setBiome(biomeGrid.getBiome(x, y, z));
                     }
+                    // Delete any slimefun blocks
+                    Location loc = new Location(chunk.getWorld(), baseX + x, y, baseZ + z);
+                    plugin.getHooks().getHook("Slimefun")
+                            .ifPresent(sf -> ((SlimefunHook) sf).clearBlockInfo(loc, true));
                 }
             }
         }