fix: player list are now only updating uuids not sending the full report

objz · objz · commit f264fd0865a9 · 2026-03-01T00:07:12.000+01:00
diff --git a/backends/bukkit/src/main/java/dev/objz/commandbridge/bukkit/Adapter.java b/backends/bukkit/src/main/java/dev/objz/commandbridge/bukkit/Adapter.java
@@ -6,6 +6,7 @@
 import dev.objz.commandbridge.backends.net.in.ExecuteCommandHandler;
 import dev.objz.commandbridge.backends.net.in.RegistrationHandler;
 import dev.objz.commandbridge.backends.net.out.ctx.PlayerListContext;
+import dev.objz.commandbridge.backends.net.out.ctx.PlayerUpdateContext;
 import dev.objz.commandbridge.backends.platform.PathsUtil;
 import dev.objz.commandbridge.backends.platform.PlatformAdapter;
 import dev.objz.commandbridge.backends.platform.cmd.ClientCommands;
@@ -151,16 +152,37 @@ private void sendPlayerList() {
         }
     }
 
+    private void sendPlayerJoin(java.util.UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_JOIN,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player join: {}", e.getMessage());
+        }
+    }
+
+    private void sendPlayerLeave(java.util.UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_LEAVE,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player leave: {}", e.getMessage());
+        }
+    }
+
     private class PlayerListener implements Listener {
         @EventHandler
         public void onJoin(PlayerJoinEvent event) {
-            sendPlayerList();
+            sendPlayerJoin(event.getPlayer().getUniqueId());
         }
 
         @EventHandler
         public void onQuit(PlayerQuitEvent event) {
             // Delay slightly so the quitting player is removed from online list
-            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> sendPlayerList(), 1L);
+            java.util.UUID uuid = event.getPlayer().getUniqueId();
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> sendPlayerLeave(uuid), 1L);
         }
     }
 
diff --git a/backends/folia/src/main/java/dev/objz/commandbridge/folia/Adapter.java b/backends/folia/src/main/java/dev/objz/commandbridge/folia/Adapter.java
@@ -6,6 +6,7 @@
 import dev.objz.commandbridge.backends.net.in.ExecuteCommandHandler;
 import dev.objz.commandbridge.backends.net.in.RegistrationHandler;
 import dev.objz.commandbridge.backends.net.out.ctx.PlayerListContext;
+import dev.objz.commandbridge.backends.net.out.ctx.PlayerUpdateContext;
 import dev.objz.commandbridge.backends.platform.PathsUtil;
 import dev.objz.commandbridge.backends.platform.PlatformAdapter;
 import dev.objz.commandbridge.backends.platform.cmd.ClientCommands;
@@ -146,16 +147,37 @@ private void sendPlayerList() {
         }
     }
 
+    private void sendPlayerJoin(java.util.UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_JOIN,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player join: {}", e.getMessage());
+        }
+    }
+
+    private void sendPlayerLeave(java.util.UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_LEAVE,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player leave: {}", e.getMessage());
+        }
+    }
+
     private class PlayerListener implements Listener {
         @EventHandler
         public void onJoin(PlayerJoinEvent event) {
-            sendPlayerList();
+            sendPlayerJoin(event.getPlayer().getUniqueId());
         }
 
         @EventHandler
         public void onQuit(PlayerQuitEvent event) {
             // Use Folia async scheduler for slight delay
-            Bukkit.getAsyncScheduler().runDelayed(plugin, (t) -> sendPlayerList(), 50, TimeUnit.MILLISECONDS);
+            java.util.UUID uuid = event.getPlayer().getUniqueId();
+            Bukkit.getAsyncScheduler().runDelayed(plugin, (t) -> sendPlayerLeave(uuid), 50, TimeUnit.MILLISECONDS);
         }
     }
 
diff --git a/backends/paper/src/main/java/dev/objz/commandbridge/paper/Adapter.java b/backends/paper/src/main/java/dev/objz/commandbridge/paper/Adapter.java
@@ -6,6 +6,7 @@
 import dev.objz.commandbridge.backends.net.in.ExecuteCommandHandler;
 import dev.objz.commandbridge.backends.net.in.RegistrationHandler;
 import dev.objz.commandbridge.backends.net.out.ctx.PlayerListContext;
+import dev.objz.commandbridge.backends.net.out.ctx.PlayerUpdateContext;
 import dev.objz.commandbridge.backends.platform.PathsUtil;
 import dev.objz.commandbridge.backends.platform.PlatformAdapter;
 import dev.objz.commandbridge.backends.platform.cmd.ClientCommands;
@@ -151,15 +152,36 @@ private void sendPlayerList() {
         }
     }
 
+    private void sendPlayerJoin(java.util.UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_JOIN,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player join: {}", e.getMessage());
+        }
+    }
+
+    private void sendPlayerLeave(java.util.UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_LEAVE,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player leave: {}", e.getMessage());
+        }
+    }
+
     private class PlayerListener implements Listener {
         @EventHandler
         public void onJoin(PlayerJoinEvent event) {
-            sendPlayerList();
+            sendPlayerJoin(event.getPlayer().getUniqueId());
         }
 
         @EventHandler
         public void onQuit(PlayerQuitEvent event) {
-            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> sendPlayerList(), 1L);
+            java.util.UUID uuid = event.getPlayer().getUniqueId();
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> sendPlayerLeave(uuid), 1L);
         }
     }
 
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/MessageRouter.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/MessageRouter.java
@@ -4,6 +4,7 @@
 import dev.objz.commandbridge.backends.net.out.AuthRequest;
 import dev.objz.commandbridge.backends.net.out.InvokedCommandEvent;
 import dev.objz.commandbridge.backends.net.out.PlayerListEvent;
+import dev.objz.commandbridge.backends.net.out.PlayerUpdateEvent;
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.InNode;
 import dev.objz.commandbridge.net.OutNode;
@@ -122,6 +123,8 @@ protected void onClose(WebSocketChannel ch, StreamSourceFrameChannel frameChanne
         outNode.register(MessageType.AUTH_REQUEST, new AuthRequest(new AuthService(secret), location));
         outNode.register(MessageType.INVOKED_COMMAND, new InvokedCommandEvent());
         outNode.register(MessageType.PLAYER_LIST, new PlayerListEvent());
+        outNode.register(MessageType.PLAYER_JOIN, new PlayerUpdateEvent(MessageType.PLAYER_JOIN));
+        outNode.register(MessageType.PLAYER_LEAVE, new PlayerUpdateEvent(MessageType.PLAYER_LEAVE));
 
         inNode.register(MessageType.PING, new PingHandler());
     }
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/RedisMessageRouter.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/RedisMessageRouter.java
@@ -4,6 +4,7 @@
 import dev.objz.commandbridge.backends.net.out.AuthRequest;
 import dev.objz.commandbridge.backends.net.out.InvokedCommandEvent;
 import dev.objz.commandbridge.backends.net.out.PlayerListEvent;
+import dev.objz.commandbridge.backends.net.out.PlayerUpdateEvent;
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.Endpoint;
 import dev.objz.commandbridge.net.InNode;
@@ -71,6 +72,8 @@ public void setupEndpoint(Endpoint endpoint) {
         outNode.register(MessageType.AUTH_REQUEST, new AuthRequest(new AuthService(secret), location));
         outNode.register(MessageType.INVOKED_COMMAND, new InvokedCommandEvent());
         outNode.register(MessageType.PLAYER_LIST, new PlayerListEvent());
+        outNode.register(MessageType.PLAYER_JOIN, new PlayerUpdateEvent(MessageType.PLAYER_JOIN));
+        outNode.register(MessageType.PLAYER_LEAVE, new PlayerUpdateEvent(MessageType.PLAYER_LEAVE));
         inNode.register(MessageType.PING, new PingHandler());
     }
 
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/out/PlayerUpdateEvent.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/out/PlayerUpdateEvent.java
@@ -0,0 +1,32 @@
+package dev.objz.commandbridge.backends.net.out;
+
+import dev.objz.commandbridge.backends.net.out.ctx.PlayerUpdateContext;
+import dev.objz.commandbridge.net.OutboundHandler;
+import dev.objz.commandbridge.net.SendOperation;
+import dev.objz.commandbridge.net.payloads.util.PlayerUpdatePayload;
+import dev.objz.commandbridge.net.proto.Envelope;
+import dev.objz.commandbridge.net.proto.MessageType;
+
+public final class PlayerUpdateEvent extends OutboundHandler<PlayerUpdateContext> {
+
+    private final MessageType messageType;
+
+    public PlayerUpdateEvent(MessageType messageType) {
+        this.messageType = messageType;
+    }
+
+    @Override
+    public SendOperation accept(PlayerUpdateContext ctx) {
+        var payload = Envelope.MAPPER.valueToTree(new PlayerUpdatePayload(ctx.player()));
+
+        Envelope env = Envelope.make(
+                messageType,
+                clientId,
+                serverId,
+                payload);
+
+        SendOperation op = send(env);
+        op.dispatch();
+        return op;
+    }
+}
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/out/ctx/PlayerUpdateContext.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/out/ctx/PlayerUpdateContext.java
@@ -0,0 +1,6 @@
+package dev.objz.commandbridge.backends.net.out.ctx;
+
+import java.util.UUID;
+
+public record PlayerUpdateContext(UUID player) {
+}
diff --git a/backends/velocity/src/main/java/dev/objz/commandbridge/velocity/Adapter.java b/backends/velocity/src/main/java/dev/objz/commandbridge/velocity/Adapter.java
@@ -13,6 +13,7 @@
 import dev.objz.commandbridge.backends.net.in.ExecuteCommandHandler;
 import dev.objz.commandbridge.backends.net.in.RegistrationHandler;
 import dev.objz.commandbridge.backends.net.out.ctx.PlayerListContext;
+import dev.objz.commandbridge.backends.net.out.ctx.PlayerUpdateContext;
 import dev.objz.commandbridge.backends.platform.PathsUtil;
 import dev.objz.commandbridge.backends.platform.PlatformAdapter;
 import dev.objz.commandbridge.backends.platform.bootstrap.VelocityMain;
@@ -159,15 +160,36 @@ private void sendPlayerList() {
         }
     }
 
+    private void sendPlayerJoin(UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_JOIN,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player join: {}", e.getMessage());
+        }
+    }
+
+    private void sendPlayerLeave(UUID playerUuid) {
+        if (client == null) return;
+        try {
+            client.outboundRouter().send(MessageType.PLAYER_LEAVE,
+                    new PlayerUpdateContext(playerUuid));
+        } catch (Exception e) {
+            Log.debug("Failed to send player leave: {}", e.getMessage());
+        }
+    }
+
     private class PlayerListener {
         @Subscribe
         public void onPostLogin(PostLoginEvent event) {
-            sendPlayerList();
+            sendPlayerJoin(event.getPlayer().getUniqueId());
         }
 
         @Subscribe
         public void onDisconnect(DisconnectEvent event) {
-            proxy.getScheduler().buildTask(pluginInstance, () -> sendPlayerList())
+            UUID uuid = event.getPlayer().getUniqueId();
+            proxy.getScheduler().buildTask(pluginInstance, () -> sendPlayerLeave(uuid))
                     .delay(50, TimeUnit.MILLISECONDS)
                     .schedule();
         }
diff --git a/core/src/main/java/dev/objz/commandbridge/net/payloads/util/PlayerUpdatePayload.java b/core/src/main/java/dev/objz/commandbridge/net/payloads/util/PlayerUpdatePayload.java
@@ -0,0 +1,6 @@
+package dev.objz.commandbridge.net.payloads.util;
+
+import java.util.UUID;
+
+public record PlayerUpdatePayload(UUID player) {
+}
diff --git a/core/src/main/java/dev/objz/commandbridge/net/proto/MessageType.java b/core/src/main/java/dev/objz/commandbridge/net/proto/MessageType.java
@@ -9,5 +9,7 @@ public enum MessageType {
     EXECUTE_COMMAND_RESULT,
     SCHEDULE_LISTENER,
     PLAYER_LIST,
+    PLAYER_JOIN,
+    PLAYER_LEAVE,
     PING, PONG
 }
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/Main.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/Main.java
@@ -38,6 +38,7 @@
 import dev.objz.commandbridge.velocity.net.in.ExecuteCommandHandler;
 import dev.objz.commandbridge.velocity.net.in.InvokedCommandHandler;
 import dev.objz.commandbridge.velocity.net.in.PlayerListHandler;
+import dev.objz.commandbridge.velocity.net.in.PlayerUpdateHandler;
 import dev.objz.commandbridge.velocity.net.out.ExecuteCommandRequest;
 import dev.objz.commandbridge.velocity.net.out.PingRequest;
 import dev.objz.commandbridge.velocity.net.out.RegistrationRequest;
@@ -235,6 +236,9 @@ private void installRoutes() {
         inNode.register(MessageType.INVOKED_COMMAND, new InvokedCommandHandler(sessions, commandEntry));
         inNode.register(MessageType.EXECUTE_COMMAND_RESULT, new ExecuteCommandHandler(proxy));
         inNode.register(MessageType.PLAYER_LIST, new PlayerListHandler(sessions, playerTracker));
+        var playerUpdateHandler = new PlayerUpdateHandler(sessions, playerTracker);
+        inNode.register(MessageType.PLAYER_JOIN, playerUpdateHandler);
+        inNode.register(MessageType.PLAYER_LEAVE, playerUpdateHandler);
 
         outNode.setEndpointSendFactory((endpoint, env) -> endpointServer.send(endpoint, env));
         outNode.register(MessageType.REGISTER_COMMANDS, new RegistrationRequest());
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/CommandDispatcher.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/CommandDispatcher.java
@@ -62,7 +62,8 @@ private void dispatchToTarget(ExecutionContext ctx, CmdMapping cmd, IdMapping ta
         if (cmd.server() != null && cmd.server().targetRequired()
                 && ctx.source() instanceof Player player) {
             boolean playerOnTarget = switch (targetLoc) {
-                case VELOCITY -> velocityExecutor.isLocal(targetId);
+                case VELOCITY -> velocityExecutor.isLocal(targetId)
+                        || playerTracker.isPlayerOn(player.getUniqueId(), targetId);
                 case BACKEND -> playerTracker.isPlayerOn(player.getUniqueId(), targetId);
             };
             if (!playerOnTarget) {
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/net/in/PlayerUpdateHandler.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/net/in/PlayerUpdateHandler.java
@@ -0,0 +1,59 @@
+package dev.objz.commandbridge.velocity.net.in;
+
+import dev.objz.commandbridge.logging.Log;
+import dev.objz.commandbridge.net.Endpoint;
+import dev.objz.commandbridge.net.InboundHandler;
+import dev.objz.commandbridge.net.payloads.util.PlayerUpdatePayload;
+import dev.objz.commandbridge.net.proto.Envelope;
+import dev.objz.commandbridge.net.proto.MessageType;
+import dev.objz.commandbridge.velocity.net.session.ClientSession;
+import dev.objz.commandbridge.velocity.net.session.SessionHub;
+import dev.objz.commandbridge.velocity.util.PlayerTracker;
+
+import java.util.Objects;
+
+public final class PlayerUpdateHandler extends InboundHandler {
+
+    private final SessionHub sessions;
+    private final PlayerTracker playerTracker;
+
+    public PlayerUpdateHandler(SessionHub sessions, PlayerTracker playerTracker) {
+        this.sessions = Objects.requireNonNull(sessions);
+        this.playerTracker = Objects.requireNonNull(playerTracker);
+    }
+
+    @Override
+    public void accept(Endpoint endpoint, Envelope env) {
+        if (env.payload() == null) {
+            Log.warn("Received {} with null payload from '{}'", env.type(), env.from());
+            return;
+        }
+
+        PlayerUpdatePayload payload;
+        try {
+            payload = Envelope.MAPPER.treeToValue(env.payload(), PlayerUpdatePayload.class);
+        } catch (Exception e) {
+            Log.error(e, "Failed to parse {} from '{}'", env.type(), env.from());
+            return;
+        }
+
+        if (payload == null || payload.player() == null) {
+            Log.warn("Parsed {} has null player from '{}'", env.type(), env.from());
+            return;
+        }
+
+        ClientSession session = sessions.get(endpoint);
+        if (session == null) {
+            Log.warn("No session found for {} from '{}'", env.type(), env.from());
+            return;
+        }
+
+        if (env.type() == MessageType.PLAYER_JOIN) {
+            playerTracker.addPlayer(session.id(), payload.player());
+            Log.debug("Player joined on '{}': {}", session.id(), payload.player());
+        } else if (env.type() == MessageType.PLAYER_LEAVE) {
+            playerTracker.removePlayer(session.id(), payload.player());
+            Log.debug("Player left on '{}': {}", session.id(), payload.player());
+        }
+    }
+}
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/util/PlayerTracker.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/util/PlayerTracker.java
@@ -1,6 +1,5 @@
 package dev.objz.commandbridge.velocity.util;
 
-import java.util.Collections;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -11,7 +10,22 @@ public final class PlayerTracker {
 
     public void update(String clientId, Set<UUID> players) {
         if (clientId == null) return;
-        playersByClient.put(clientId, Collections.unmodifiableSet(players));
+        Set<UUID> set = playersByClient.computeIfAbsent(clientId, k -> ConcurrentHashMap.newKeySet());
+        set.clear();
+        set.addAll(players);
+    }
+
+    public void addPlayer(String clientId, UUID playerUuid) {
+        if (clientId == null || playerUuid == null) return;
+        playersByClient.computeIfAbsent(clientId, k -> ConcurrentHashMap.newKeySet()).add(playerUuid);
+    }
+
+    public void removePlayer(String clientId, UUID playerUuid) {
+        if (clientId == null || playerUuid == null) return;
+        Set<UUID> players = playersByClient.get(clientId);
+        if (players != null) {
+            players.remove(playerUuid);
+        }
     }
 
     public void remove(String clientId) {

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,7 @@ public enum MessageType {`
`9`	`9`	`EXECUTE_COMMAND_RESULT,`
`10`	`10`	`SCHEDULE_LISTENER,`
`11`	`11`	`PLAYER_LIST,`
	`12`	`+ PLAYER_JOIN,`
	`13`	`+ PLAYER_LEAVE,`
`12`	`14`	`PING, PONG`
`13`	`15`	`}`