fixed sections not sending

Author: dragon731012

src/main/java/net/potato/tuff/TuffX.java

@@ -241,25 +241,26 @@ public void run() {
                     }
 
                     Queue<Vector> queue = requestQueue.get(playerUUID);
-                    if (queue == null) continue;
-
-                    for (int i = 0; i < CHUNKS_PER_TICK && !queue.isEmpty(); i++) {
-                        Vector vec = queue.poll();
-                        if (vec == null) continue;
-
-                        World world = player.getWorld();
-                        WorldChunkKey key = new WorldChunkKey(world.getName(), vec.getBlockX(), vec.getBlockZ());
-
-                        List<byte[]> cachedData = chunkPayloadCache.getIfPresent(key);
-                        if (cachedData != null) {
-                            sendPayloadsToPlayer(player, cachedData);
-                            checkIfInitialLoadComplete(player);
-                        } else {
-                            if (world.isChunkLoaded(key.x(), key.z())) {
-                                processAndSendChunk(player, world.getChunkAt(key.x(), key.z()));
-                            } else {
-                                world.loadChunk(key.x(), key.z(), true);
-                                queue.add(vec);
+                    if (queue != null && !queue.isEmpty()) {
+                        for (int i = 0; i < CHUNKS_PER_TICK && !queue.isEmpty(); i++) {
+                            Vector vec = queue.poll();
+                            if (vec != null) {
+                                World world = player.getWorld();
+
+                                WorldChunkKey key = new WorldChunkKey(world.getName(), vec.getBlockX(), vec.getBlockZ());
+                                List<byte[]> cachedData = chunkPayloadCache.getIfPresent(key);
+                                if (cachedData != null) {
+                                    sendPayloadsToPlayer(player, cachedData);
+                                    checkIfInitialLoadComplete(player);
+                                    continue;
+                                }
+
+                                if (world.isChunkLoaded(vec.getBlockX(), vec.getBlockZ())) {
+                                    processAndSendChunk(player, world.getChunkAt(vec.getBlockX(), vec.getBlockZ()));
+                                } else {
+                                    world.loadChunk(vec.getBlockX(), vec.getBlockZ(), true);
+                                    queue.add(vec); 
+                                }
                             }
                         }
                     }
@@ -268,6 +269,41 @@ public void run() {
         }.runTaskTimer(this, 0L, 1L);
     }
 
+    private void sendPayloadsToPlayer(Player player, List<byte[]> payloads) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (player.isOnline()) {
+                    for (byte[] payload : payloads) {
+                        player.sendPluginMessage(TuffX.this, CHANNEL, payload);
+                    }
+                }
+            }
+        }.runTask(this);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+        UUID playerId = player.getUniqueId();
+
+        Queue<Vector> playerQueue = requestQueue.get(playerId);
+        if (playerQueue != null && !playerQueue.isEmpty()) {
+            logDebug("Player " + player.getName() + " changed worlds. Clearing " + playerQueue.size() + " pending chunk requests.");
+            playerQueue.clear();
+        }
+        
+        if (initialChunksToProcess.remove(playerId) != null) {
+            logDebug("Player " + player.getName() + " was in the middle of an initial chunk load. The process has been cancelled.");
+            awaitingInitialBatch.remove(playerId);
+            player.sendPluginMessage(this, CHANNEL, createLoadFinishedPayload());
+        }
+
+        player.sendPluginMessage(this, CHANNEL, createDimensionPayload());
+
+        player.sendPluginMessage(this, CHANNEL, createBelowY0StatusPayload(enabledWorlds.contains(player.getWorld().getName())));
+    }
+
     private void processAndSendChunk(final Player player, final Chunk chunk) {
         if (chunk == null || !player.isOnline() || chunkProcessorPool.isShutdown()) {
             return;
@@ -280,9 +316,10 @@ private void processAndSendChunk(final Player player, final Chunk chunk) {
             final ChunkSnapshot snapshot = chunk.getChunkSnapshot(true, false, false);
             final Map<BlockData, int[]> conversionCache = threadLocalConversionCache.get();
             conversionCache.clear(); 
+
             for (int sectionY = -4; sectionY < 0; sectionY++) {
                 if (!player.isOnline()) {
-                    return; 
+                    return;
                 }
                 try {
                     byte[] payload = createSectionPayload(snapshot, chunk.getX(), chunk.getZ(), sectionY, conversionCache);
@@ -300,55 +337,16 @@ private void processAndSendChunk(final Player player, final Chunk chunk) {
                 @Override
                 public void run() {
                     if (player.isOnline()) {
-                        sendPayloadsToPlayer(player, processedPayloads);
+                        for (byte[] payload : processedPayloads) {
+                            player.sendPluginMessage(TuffX.this, CHANNEL, payload);
+                        }
                         checkIfInitialLoadComplete(player);
                     }
                 }
             }.runTask(this);
         });
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        UUID playerId = player.getUniqueId();
-
-        Queue<Vector> playerQueue = requestQueue.get(playerId);
-        if (playerQueue != null && !playerQueue.isEmpty()) {
-            logDebug("Player " + player.getName() + " changed worlds. Clearing " + playerQueue.size() + " pending chunk requests.");
-            playerQueue.clear();
-        }
-        
-        if (initialChunksToProcess.remove(playerId) != null) {
-            logDebug("Player " + player.getName() + " was in the middle of an initial chunk load. The process has been cancelled.");
-            awaitingInitialBatch.remove(playerId);
-            player.sendPluginMessage(this, CHANNEL, createLoadFinishedPayload());
-        }
-
-        player.sendPluginMessage(this, CHANNEL, createDimensionPayload());
-
-        player.sendPluginMessage(this, CHANNEL, createBelowY0StatusPayload(enabledWorlds.contains(player.getWorld().getName())));
-    }
-
-    private void sendPayloadsToPlayer(Player player, List<byte[]> payloads) {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                if (player.isOnline()) {
-                    for (byte[] payload : payloads) {
-                        player.sendPluginMessage(TuffX.this, CHANNEL, payload);
-                    }
-                }
-            }
-        }.runTask(this);
-    }
-
-    private void invalidateChunkCache(World world, int blockX, int blockZ) {
-        WorldChunkKey key = new WorldChunkKey(world.getName(), blockX >> 4, blockZ >> 4);
-        chunkPayloadCache.invalidate(key);
-        logDebug("Invalidated cache for chunk: " + key);
-    }
-
     private void checkIfInitialLoadComplete(Player player) {
         UUID playerId = player.getUniqueId();
         AtomicInteger counter = initialChunksToProcess.get(playerId);
@@ -366,6 +364,12 @@ private void checkIfInitialLoadComplete(Player player) {
         }
     }
 
+    private void invalidateChunkCache(World world, int blockX, int blockZ) {
+        WorldChunkKey key = new WorldChunkKey(world.getName(), blockX >> 4, blockZ >> 4);
+        chunkPayloadCache.invalidate(key);
+        logDebug("Invalidated cache for chunk: " + key);
+    }
+
     private byte[] createLoadFinishedPayload() {
         try (ByteArrayOutputStream bout = new ByteArrayOutputStream(); 
             DataOutputStream out = new DataOutputStream(bout)) {
@@ -472,7 +476,8 @@ public void onBlockPlace(BlockPlaceEvent event) {
     public void onBlockPhysics(BlockPhysicsEvent event) { 
         Block block = event.getBlock(); 
         if (block.getY() < 0) {
-            sendSingleBlockUpdate(block.getLocation(), block.getBlockData());sendLightingUpdate(block.getLocation()); 
+            sendSingleBlockUpdate(block.getLocation(), block.getBlockData());
+            //sendLightingUpdate(block.getLocation()); 
             invalidateChunkCache(block.getWorld(), block.getX(), block.getZ());
         }
     }