Skip to content

fix(velocity): never transfer players who are inside a round #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hbrombeer merged 1 commit into from
Aug 2, 2026
Merged

fix(velocity): never transfer players who are inside a round #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions velocity/src/main/kotlin/gg/grounds/drain/DrainManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ import org.slf4j.Logger
* - players sitting in a lobby are sent a Minecraft transfer packet right away,
* - players inside a round stay untouched — Agones keeps their GameServer alive, and the moment the
* round sends them back towards a lobby the transfer happens *instead of* that connect,
* - at the deadline everyone still here is transferred regardless, because a transfer that ends a
* round early still beats the kick that is otherwise seconds away.
* - at the deadline, whoever is *not* inside a round is transferred; players inside a round are
* never transferred — the round either ends within the grace period (and the lobby connect
* becomes the transfer), or the pod's termination ends the session. A transfer would end the
* round just as surely, only earlier.
*
* "Inside a round" is decided by the server's `grounds/server-type` role: anything that is not the
* lobby role defers the transfer. A server that discovery has no role for cannot be a protected
Expand Down Expand Up @@ -75,8 +77,21 @@ class DrainManager(
private fun onDeadline() {
val remaining = proxy.allPlayers
if (remaining.isEmpty()) return
logger.warn("Drain deadline reached with {} players left; transferring all", remaining.size)
remaining.forEach { transferOut(it, force = true) }
val (inRound, drainable) = remaining.partition { shouldDefer(roleOf(it), lobbyValue) }
if (drainable.isNotEmpty()) {
logger.warn(
"Drain deadline reached; transferring {} players not inside a round",
drainable.size,
)
drainable.forEach { transferOut(it, force = true) }
}
if (inRound.isNotEmpty()) {
logger.warn(
"Drain deadline reached with {} players still inside a round; leaving them " +
"until the round ends or the pod is terminated",
inRound.size,
)
}
}

/**
Expand Down