some bug fixes

Author: dragon731012

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

@@ -24,6 +24,7 @@
 import org.bukkit.util.Vector;
 import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -45,6 +46,7 @@ public class TuffX extends JavaPlugin implements Listener, PluginMessageListener
 
     private final Set<UUID> awaitingInitialBatch = ConcurrentHashMap.newKeySet();
     private final Map<UUID, AtomicInteger> initialChunksToProcess = new ConcurrentHashMap<>();
+    private Set<String> enabledWorlds;
 
     private BukkitTask processorTask;
 
@@ -59,6 +61,9 @@ public void onEnable() {
         saveDefaultConfig();
         this.CHUNKS_PER_TICK = getConfig().getInt("chunks-per-tick", 6);
         this.debug = getConfig().getBoolean("debug-mode", false);
+        this.enabledWorlds = new HashSet<>(getConfig().getStringList("enabled-worlds"));
+        
+        logDebug("TuffX will be active in the following worlds: " + String.join(", ", this.enabledWorlds));
 
         getServer().getMessenger().registerOutgoingPluginChannel(this, CHANNEL);
         getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL, this);
@@ -100,6 +105,12 @@ private void handleSingleChunkRequest(Player player, int chunkX, int chunkZ, UUI
 
     private void handleIncomingPacket(Player player, Location loc, String action, int chunkX, int chunkZ, DataInputStream in) throws IOException {
         UUID playerId = player.getUniqueId();
+
+        if (!enabledWorlds.contains(player.getWorld().getName())) {
+            if (awaitingInitialBatch.contains(playerId)) player.sendPluginMessage(this, CHANNEL, createLoadFinishedPayload());
+            return;
+        }
+
         switch (action.toLowerCase()) {
             case "request_chunk":
                 handleSingleChunkRequest(player,chunkX,chunkZ,playerId);
@@ -183,6 +194,25 @@ public void run() {
         }.runTaskTimer(this, 0L, 1L);
     }
 
+    @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 from their old world.");
+            playerQueue.clear();
+        }
+        
+        if (awaitingInitialBatch.remove(playerId)) {
+            logDebug("Player " + player.getName() + " changed worlds during initial load. Cancelling.");
+            player.sendPluginMessage(this, CHANNEL, createLoadFinishedPayload());
+            initialChunksToProcess.remove(playerId);
+        }
+    }
+
     private void processAndSendChunk(final Player player, final Chunk chunk) {
         if (chunk == null || !player.isOnline()) return;
 

src/main/resources/config.yml

@@ -1,4 +1,9 @@
 #debug mode
 debug-mode: false
+
 #amount of chunks to send per tick to players
-chunks-per-tick: 6
+chunks-per-tick: 6
+
+#worlds for y0 to be enabled in (experimental)
+enabled-worlds:
+    - 'world'

target/TuffX.jar

@@ -1,4 +1,9 @@
 #debug mode
 debug-mode: false
+
 #amount of chunks to send per tick to players
-chunks-per-tick: 6
+chunks-per-tick: 6
+
+#worlds for y0 to be enabled in (experimental)
+enabled-worlds:
+    - 'world'