fix(ravengard): dungeon instantiate over the service channel plus admin flow

Swofty-Developments · Swofty-Developments · commit a0891d664e2c · 2026-08-03T11:00:20.000+10:00
The instantiate push never reached the dungeon server because the handler
was registered on the proxy channel while the orchestrator sends on the
service channel, which is what the timeout was; it now registers through
getServiceHandlers the way the bedwars game does. Admin generation no
longer transfers the runner: it allocates the instance and answers with
its id and a clickable /dungeon admin join invite, and joining an admin
instance teleports the runner into creative high above the dungeon's
centre looking straight down. Instances with nobody inside self-destruct
after thirty seconds, tracked from creation, and the listing shows the
remaining countdown on each empty instance through the heartbeat's map
field.
diff --git a/commons/src/main/java/net/swofty/commons/protocol/objects/orchestrator/ListGamesProtocol.java b/commons/src/main/java/net/swofty/commons/protocol/objects/orchestrator/ListGamesProtocol.java
@@ -29,7 +29,7 @@ public record ListGamesMessage(ServerType type) { }
     public record GameSummary(String gameId, String gameTypeName, String map,
                               int playerCount, boolean acceptingJoins) { }
 
-    public record ServerGames(String shortName, int onlinePlayers, int maxPlayers,
+    public record ServerGames(String shortName, String serverUuid, int onlinePlayers, int maxPlayers,
                               Integer remainingGameSlots, List<GameSummary> games) { }
 
     public record ListGamesResponse(List<ServerGames> servers, boolean success, String error) { }
diff --git a/service.orchestrator/src/main/java/net/swofty/service/orchestrator/endpoints/ListGamesEndpoint.java b/service.orchestrator/src/main/java/net/swofty/service/orchestrator/endpoints/ListGamesEndpoint.java
@@ -34,7 +34,7 @@ public ListGamesProtocol.ListGamesResponse handle(ListGamesProtocol.ListGamesMes
                         game.game().isAcceptingJoins()));
             }
             servers.add(new ListGamesProtocol.ServerGames(server.shortName(),
-                    server.onlinePlayers(), server.maxPlayers(),
+                    server.uuid().toString(), server.onlinePlayers(), server.maxPlayers(),
                     server.remainingGameSlots(), games));
         }
         return new ListGamesProtocol.ListGamesResponse(servers, true, null);
diff --git a/type.ravengarddungeon/src/main/java/net/swofty/type/ravengarddungeon/TypeRavengardDungeonLoader.java b/type.ravengarddungeon/src/main/java/net/swofty/type/ravengarddungeon/TypeRavengardDungeonLoader.java
@@ -69,6 +69,7 @@ public void onInitialize(MinecraftServer server) {
 
     @Override
     public void afterInitialize(MinecraftServer server) {
+        net.swofty.type.ravengarddungeon.game.DungeonInstanceRegistry.startExpiryTask();
         startOrchestratorHeartbeat();
     }
 
@@ -79,7 +80,8 @@ private void startOrchestratorHeartbeat() {
                 net.swofty.type.game.game.GameObject game = new net.swofty.type.game.game.GameObject();
                 game.setGameId(instance.getGameId());
                 game.setType(ServerType.RAVENGARD_DUNGEON);
-                game.setMap("generated");
+                game.setMap(instance.getPlayers().isEmpty()
+                        ? "empty:" + instance.getRemainingLifeSeconds() : "generated");
                 game.setGameTypeName(instance.getMode());
                 game.setAcceptingJoins(instance.isAcceptingJoins());
                 game.setInvolvedPlayers(new java.util.ArrayList<>(instance.getPlayers()));
@@ -141,8 +143,12 @@ public List<HypixelNPC> getNPCs() {
 
     @Override
     public List<RedisMessageHandler<?, ?>> getProxyHandlers() {
-        return List.of(new net.swofty.type.ravengarddungeon.redis.DungeonInstantiateGameHandler(),
-                new net.swofty.type.generic.redis.service.GameInformationHandler());
+        return List.of();
+    }
+
+    @Override
+    public List<RedisMessageHandler<?, ?>> getServiceHandlers() {
+        return List.of(new net.swofty.type.ravengarddungeon.redis.DungeonInstantiateGameHandler());
     }
 
     @Override
diff --git a/type.ravengarddungeon/src/main/java/net/swofty/type/ravengarddungeon/events/ActionPlayerDungeonAssign.java b/type.ravengarddungeon/src/main/java/net/swofty/type/ravengarddungeon/events/ActionPlayerDungeonAssign.java
@@ -35,24 +35,42 @@ public void onSpawn(PlayerSpawnEvent event) {
             player.sendMessage("§cYour dungeon instance no longer exists.");
             return;
         }
-        instance.getPlayers().add(player.getUuid());
+        instance.markPlayerJoined(player.getUuid());
         player.sendMessage("§7Preparing your dungeon (seed §f" + instance.getSeed() + "§7)...");
+        boolean aerial = instance.getMode().equals("ADMIN");
         instance.whenReady().thenRun(() -> player.scheduler().scheduleNextTick(() -> {
-            Pos spawn = instance.getGenerated().spawn().withY(67);
+            Pos spawn;
+            if (aerial) {
+                double[] center = boundsCenter(instance);
+                spawn = new Pos(center[0], 140, center[1], 0, 90);
+                player.setGameMode(net.minestom.server.entity.GameMode.CREATIVE);
+            } else {
+                spawn = instance.getGenerated().spawn().withY(67);
+            }
             player.setInstance(instance.getInstance(), spawn);
             player.sendMessage("§aEntered dungeon §f" + instance.getGameId().toString().substring(0, 8)
                     + "§a (" + instance.getGenerated().dungeon().getRoomCount() + " rooms, mode "
                     + instance.getMode() + ").");
         }));
     }
 
+    private static double[] boundsCenter(DungeonInstanceRegistry.DungeonInstance instance) {
+        int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE;
+        int minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
+        for (var placement : instance.getGenerated().dungeon().getPlacements()) {
+            minX = Math.min(minX, placement.originX());
+            maxX = Math.max(maxX, placement.originX() + placement.getFootprintWidth());
+            minZ = Math.min(minZ, placement.originZ());
+            maxZ = Math.max(maxZ, placement.originZ() + placement.getFootprintDepth());
+        }
+        return new double[]{(minX + maxX) / 2.0, (minZ + maxZ) / 2.0};
+    }
+
     @PhasedEvent(node = EventNodes.PLAYER, requireDataLoaded = false, phase = EventPhase.DISCONNECT)
     public void onDisconnect(PlayerDisconnectEvent event) {
         UUID uuid = event.getPlayer().getUuid();
         for (DungeonInstanceRegistry.DungeonInstance instance : DungeonInstanceRegistry.all()) {
-            if (instance.getPlayers().remove(uuid)) {
-                DungeonInstanceRegistry.removeIfEmpty(instance.getGameId());
-            }
+            instance.markPlayerLeft(uuid);
         }
     }
 }
diff --git a/type.ravengarddungeon/src/main/java/net/swofty/type/ravengarddungeon/game/DungeonInstanceRegistry.java b/type.ravengarddungeon/src/main/java/net/swofty/type/ravengarddungeon/game/DungeonInstanceRegistry.java
@@ -24,6 +24,8 @@ public final class DungeonInstanceRegistry {
     private DungeonInstanceRegistry() {
     }
 
+    public static final long EMPTY_LIFETIME_MILLIS = 30_000;
+
     public static final class DungeonInstance {
         private final UUID gameId = UUID.randomUUID();
         private final String mode;
@@ -32,6 +34,28 @@ public static final class DungeonInstance {
         private final CompletableFuture<Void> ready;
         private final RavengardDungeonGenerator.GeneratedDungeon generated;
         private final Set<UUID> players = ConcurrentHashMap.newKeySet();
+        private volatile long emptySince = System.currentTimeMillis();
+
+        public void markPlayerJoined(UUID player) {
+            players.add(player);
+            emptySince = 0;
+        }
+
+        public void markPlayerLeft(UUID player) {
+            if (players.remove(player) && players.isEmpty()) {
+                emptySince = System.currentTimeMillis();
+            }
+        }
+
+        public long getRemainingLifeSeconds() {
+            if (!players.isEmpty() || emptySince == 0) return -1;
+            return Math.max(0, (EMPTY_LIFETIME_MILLIS - (System.currentTimeMillis() - emptySince)) / 1000);
+        }
+
+        public boolean isExpired() {
+            return players.isEmpty() && emptySince > 0
+                    && System.currentTimeMillis() - emptySince > EMPTY_LIFETIME_MILLIS;
+        }
 
         private DungeonInstance(String mode, long seed, InstanceContainer instance,
                                 RavengardDungeonGenerator.GeneratedDungeon generated,
@@ -111,11 +135,14 @@ public static int remainingSlots() {
         return Math.max(0, MAX_INSTANCES - INSTANCES.size());
     }
 
-    public static void removeIfEmpty(UUID gameId) {
-        DungeonInstance dungeonInstance = INSTANCES.get(gameId);
-        if (dungeonInstance != null && dungeonInstance.getPlayers().isEmpty()) {
-            INSTANCES.remove(gameId);
-            MinecraftServer.getInstanceManager().unregisterInstance(dungeonInstance.getInstance());
-        }
+    public static void startExpiryTask() {
+        MinecraftServer.getSchedulerManager().buildTask(() -> {
+            for (DungeonInstance instance : INSTANCES.values()) {
+                if (instance.isExpired()) {
+                    INSTANCES.remove(instance.getGameId());
+                    MinecraftServer.getInstanceManager().unregisterInstance(instance.getInstance());
+                }
+            }
+        }).repeat(net.minestom.server.timer.TaskSchedule.seconds(1)).schedule();
     }
 }
diff --git a/type.ravengardgeneric/src/main/java/net/swofty/type/ravengardgeneric/commands/DungeonCommand.java b/type.ravengardgeneric/src/main/java/net/swofty/type/ravengardgeneric/commands/DungeonCommand.java
@@ -32,6 +32,7 @@ public void registerUsage(MinestomCommand command) {
             if (player.getRank().isStaff()) {
                 player.sendMessage("§e/dungeon list §7- every dungeon server and its instances");
                 player.sendMessage("§e/dungeon admin generate [seed] [rooms] §7- dedicated instance");
+                player.sendMessage("§e/dungeon admin join <instance> §7- fly over an instance");
             }
         });
 
@@ -49,21 +50,86 @@ public void registerUsage(MinestomCommand command) {
 
         command.addSyntax((sender, context) -> {
             if (!permissionCheck(sender, Rank.STAFF)) return;
-            queue((RavengardPlayer) sender,
+            adminGenerate((RavengardPlayer) sender,
                     "ADMIN:" + ThreadLocalRandom.current().nextLong() + ":" + DEFAULT_ADMIN_ROOMS);
         }, ArgumentType.Literal("admin"), ArgumentType.Literal("generate"));
 
         command.addSyntax((sender, context) -> {
             if (!permissionCheck(sender, Rank.STAFF)) return;
-            queue((RavengardPlayer) sender,
+            adminGenerate((RavengardPlayer) sender,
                     "ADMIN:" + context.get(seedArg) + ":" + DEFAULT_ADMIN_ROOMS);
         }, ArgumentType.Literal("admin"), ArgumentType.Literal("generate"), seedArg);
 
         command.addSyntax((sender, context) -> {
             if (!permissionCheck(sender, Rank.STAFF)) return;
-            queue((RavengardPlayer) sender,
+            adminGenerate((RavengardPlayer) sender,
                     "ADMIN:" + context.get(seedArg) + ":" + context.get(roomsArg));
         }, ArgumentType.Literal("admin"), ArgumentType.Literal("generate"), seedArg, roomsArg);
+
+        var instanceArg = ArgumentType.Word("instance");
+        command.addSyntax((sender, context) -> {
+            if (!permissionCheck(sender, Rank.STAFF)) return;
+            adminJoin((RavengardPlayer) sender, context.get(instanceArg));
+        }, ArgumentType.Literal("admin"), ArgumentType.Literal("join"), instanceArg);
+    }
+
+    private static void adminGenerate(RavengardPlayer player, String mode) {
+        player.sendMessage("§7Allocating a dungeon instance...");
+        GetServerForMapProtocol.GetServerForMapMessage request =
+                new GetServerForMapProtocol.GetServerForMapMessage(
+                        ServerType.RAVENGARD_DUNGEON, null, mode, 1);
+        ORCHESTRATOR.handleRequest(request).thenAccept(response -> {
+            if (!(response instanceof GetServerForMapProtocol.GetServerForMapResponse(
+                    UnderstandableProxyServer server, String gameId, boolean success, String error))
+                    || server == null || gameId == null) {
+                String reason = response instanceof GetServerForMapProtocol.GetServerForMapResponse r
+                        && r.error() != null ? r.error() : "no servers available";
+                player.sendMessage("§cCould not allocate an instance: " + reason);
+                return;
+            }
+            player.sendMessage("§aInstance §f" + gameId + "§a created on §f" + server.shortName()
+                    + "§a. It self-destructs after 30s with nobody inside.");
+            player.sendMessage(net.kyori.adventure.text.Component
+                    .text("§e§l[CLICK TO JOIN] §7or run /dungeon admin join " + gameId.substring(0, 8))
+                    .clickEvent(net.kyori.adventure.text.event.ClickEvent
+                            .runCommand("/dungeon admin join " + gameId)));
+        }).exceptionally(throwable -> {
+            player.sendMessage("§cAllocation failed: " + throwable.getMessage());
+            return null;
+        });
+    }
+
+    private static void adminJoin(RavengardPlayer player, String instanceId) {
+        ORCHESTRATOR.handleRequest(new ListGamesProtocol.ListGamesMessage(ServerType.RAVENGARD_DUNGEON))
+                .thenAccept(response -> {
+                    if (!(response instanceof ListGamesProtocol.ListGamesResponse listing)
+                            || !listing.success()) {
+                        player.sendMessage("§cFailed to look the instance up.");
+                        return;
+                    }
+                    for (ListGamesProtocol.ServerGames server : listing.servers()) {
+                        for (ListGamesProtocol.GameSummary game : server.games()) {
+                            if (!game.gameId().equals(instanceId)
+                                    && !game.gameId().startsWith(instanceId)) continue;
+                            UnderstandableProxyServer proxy = new UnderstandableProxyServer(
+                                    server.shortName(),
+                                    java.util.UUID.fromString(server.serverUuid()),
+                                    ServerType.RAVENGARD_DUNGEON, -1,
+                                    new java.util.ArrayList<>(), server.maxPlayers(),
+                                    server.shortName());
+                            ORCHESTRATOR.handleRequest(new ChooseGameProtocol.ChooseGameMessage(
+                                    player.getUuid(), proxy, game.gameId())).thenRun(() -> {
+                                player.sendMessage("§aSending you to §f" + server.shortName() + "§a!");
+                                player.asProxyPlayer().transferToWithIndication(proxy.uuid());
+                            });
+                            return;
+                        }
+                    }
+                    player.sendMessage("§cNo instance found matching §f" + instanceId + "§c.");
+                }).exceptionally(throwable -> {
+                    player.sendMessage("§cLookup failed: " + throwable.getMessage());
+                    return null;
+                });
     }
 
     private boolean permissionCheck(net.minestom.server.command.CommandSender sender, Rank rank) {
@@ -123,10 +189,12 @@ private static void list(RavengardPlayer player) {
                                 + " players§7, §f" + (server.remainingGameSlots() == null
                                 ? "?" : server.remainingGameSlots()) + "§7 free instance slots");
                         for (ListGamesProtocol.GameSummary game : server.games()) {
+                            String expiry = game.map() != null && game.map().startsWith("empty:")
+                                    ? " §c(dies in " + game.map().substring(6) + "s)" : "";
                             player.sendMessage("  §8- §f" + game.gameId().substring(0, 8)
                                     + " §7" + game.gameTypeName()
                                     + " §f" + game.playerCount() + " players "
-                                    + (game.acceptingJoins() ? "§aopen" : "§cclosed"));
+                                    + (game.acceptingJoins() ? "§aopen" : "§cclosed") + expiry);
                         }
                         if (server.games().isEmpty()) {
                             player.sendMessage("  §8- §7no instances");

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public ListGamesProtocol.ListGamesResponse handle(ListGamesProtocol.ListGamesMes`
`34`	`34`	`game.game().isAcceptingJoins()));`
`35`	`35`	`}`
`36`	`36`	`servers.add(new ListGamesProtocol.ServerGames(server.shortName(),`
`37`		`- server.onlinePlayers(), server.maxPlayers(),`
	`37`	`+ server.uuid().toString(), server.onlinePlayers(), server.maxPlayers(),`
`38`	`38`	`server.remainingGameSlots(), games));`
`39`	`39`	`}`
`40`	`40`	`return new ListGamesProtocol.ListGamesResponse(servers, true, null);`