fix(1395): unbanning lifts the 48h minimum-vacation restriction#1411
Open
piciolo wants to merge 1 commit into
Open
fix(1395): unbanning lifts the 48h minimum-vacation restriction#1411piciolo wants to merge 1 commit into
piciolo wants to merge 1 commit into
Conversation
Contributor
Author
|
Closing — opened on the wrong fork by mistake. Will reopen on piciolo/OGame. |
Contributor
Non-draft alternative with test coverage@tiweb442 opened #1493 with the same unban logic plus If this draft is waiting on tests or rebase, #1493 may be easier to merge as-is. Happy to close #1493 if this PR is preferred — the controller change is identical. |
When unbanning a player, also release the vacation_mode_until time-lock so the player can manually leave vacation mode immediately. The vacation flag itself remains active (player chooses when to disable); only the 48h minimum imposed by the ban is removed.
piciolo
force-pushed
the
fix/1395-unban-lift-vacation-restriction
branch
from
July 25, 2026 15:44
15513e0 to
14e194a
Compare
Preview deploymentPreview environment for this PR is ready for functional testing. Use one of the test accounts below to log in.
Test accounts (click to expand)
This preview will be automatically destroyed when the PR is closed. |
piciolo
marked this pull request as ready for review
July 26, 2026 10:31
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1395
Problem
When a player is banned, their account is put into vacation mode (which carries a hard 48h minimum). When unbanning them shortly after banning, the 48h lock remains and the player still cannot leave vacation mode — effectively extending the ban by up to 48 hours.
Fix
In
ServerAdministrationController::unban(), after canceling the ban, release thevacation_mode_untiltime-lock so the player can manually leave vacation mode immediately.The vacation mode flag itself is intentionally not auto-disabled — the player chooses when to disable it; we only release the time-lock that the ban introduced.