Fixed block changes not sending because it was not getting the amount of blocks correctly.

Author: Kooperlol

src/main/java/codes/kooper/blockify/managers/BlockChangeManager.java

@@ -27,12 +27,11 @@
 public class BlockChangeManager {
 
     private final ConcurrentHashMap<Player, BukkitTask> blockChangeTasks;
-    private final ConcurrentHashMap<Player, Vector<Long>> chunksBeingSent;
     private final ConcurrentHashMap<BlockData, Integer> blockDataToId;
 
     public BlockChangeManager() {
         this.blockChangeTasks = new ConcurrentHashMap<>();
-        this.chunksBeingSent = new ConcurrentHashMap<>();
+        //this.chunksBeingSent = new ConcurrentHashMap<>();
         this.blockDataToId = new ConcurrentHashMap<>();
     }
 
@@ -133,7 +132,11 @@ public void sendBlockChanges(Stage stage, Audience audience, ConcurrentHashMap<B
         Bukkit.getScheduler().runTask(Blockify.getInstance(), () -> new OnBlockChangeSendEvent(stage, blockChanges).callEvent());
 
         // If there is only one block change, send it to the player directly
-        if (blockChanges.size() == 1) {
+        int blockCount = 0;
+        for (Map.Entry<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> entry : blockChanges.entrySet()) {
+            blockCount += entry.getValue().size();
+        }
+        if (blockCount == 1) {
             for (Player onlinePlayer : audience.getPlayers()) {
                 if (onlinePlayer != null) {
                     for (Map.Entry<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> entry : blockChanges.entrySet()) {
@@ -222,18 +225,6 @@ public void sendChunkPacket(Stage stage, Player player, BlockifyChunk chunk, Con
         // Get the user from PacketEvents API
         User user = PacketEvents.getAPI().getPlayerManager().getUser(player);
 
-        // Initialize the chunksBeingSent map for this player if not present
-        chunksBeingSent.computeIfAbsent(player, k -> new Vector<>());
-
-        Vector<Long> playerChunksBeingSent = chunksBeingSent.get(player);
-
-        // Ensure the chunk isn't already being sent
-        if (playerChunksBeingSent.contains(chunk.getChunkKey())) {
-            return;
-        }
-        // Add this chunk to the chunks being sent list
-        playerChunksBeingSent.add(chunk.getChunkKey());
-
         // Loop through the chunks y positions
         for (int chunkY = stage.getMinPosition().getY() >> 4; chunkY <= stage.getMaxPosition().getY() >> 4; chunkY++) {
             // Create a list of encoded blocks for PacketEvents wrapper
@@ -264,12 +255,6 @@ public void sendChunkPacket(Stage stage, Player player, BlockifyChunk chunk, Con
             WrapperPlayServerMultiBlockChange wrapper = new WrapperPlayServerMultiBlockChange(new Vector3i(chunk.x(), chunkY, chunk.z()), true, encodedBlocksArray);
             Bukkit.getScheduler().runTask(Blockify.getInstance(), () -> user.sendPacket(wrapper));
         }
-
-        // Remove the chunk from the chunks being sent list
-        playerChunksBeingSent.remove(chunk.getChunkKey());
-        if (playerChunksBeingSent.isEmpty()) {
-            chunksBeingSent.remove(player);
-        }
     }
 
 

src/main/java/codes/kooper/blockify/managers/StageManager.java

@@ -14,7 +14,11 @@
 
 @Getter
 public class StageManager {
-    private final Map<String, Stage> stages = new HashMap<>();
+    private final Map<String, Stage> stages;
+
+    public StageManager() {
+        this.stages = new HashMap<>();
+    }
 
     /**
      * Create a new stage

src/main/java/codes/kooper/blockify/models/Stage.java

@@ -71,6 +71,7 @@ public void sendBlocksToAudience() {
      * @param blocks Blocks to refresh to the audience.
      */
     public void refreshBlocksToAudience(Set<BlockifyPosition> blocks) {
+        Blockify.getInstance().getLogger().info("Refresh with size " + blocks.size());
         ConcurrentHashMap<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> blockChanges = new ConcurrentHashMap<>();
         for (View view : views) {
             for (BlockifyPosition position : blocks) {

src/main/java/codes/kooper/blockify/protocol/ChunkLoadAdapter.java

@@ -41,11 +41,6 @@ public void onPacketPlaySend(PacketPlaySendEvent event) {
                     // If the chunk is not in the world, return.
                     if (!stage.getWorld().equals(player.getWorld())) return;
 
-                    // If the chunk is being sent to the player, return.
-                    if (Blockify.getInstance().getBlockChangeManager().getChunksBeingSent().get(player.getUniqueId()) != null && Blockify.getInstance().getBlockChangeManager().getChunksBeingSent().get(player.getUniqueId()).contains(blockifyChunk.getChunkKey())) {
-                        return;
-                    }
-
                     Blockify.getInstance().getBlockChangeManager().sendChunkPacket(stage, player, blockifyChunk, view.getBlocks());
                 }
             }