[XxFran10xX]

Why

Staff could not change a faction or guild whose leader is away or stuck. Every rename, colour, banner, capital and kick command only checks "is this player the leader", so a request like "rename our capital from Research Tower of the Castle to Sunsora Castle" needed the leader online, or a hand edit of the faction file with the server stopped.

What

Two staff command groups, permission simplefactions.admin. The staff versions skip the leader check and any price, and nothing else: names, colours and membership follow the same rules as the player commands. Anything that doesn't need a location or a held item also works from the console. Every change is written to the server log as [StaffAdmin] <who> ran /<command>: <result>.

/faction admin

Subcommand	What it does
info <faction>	Leader, members, provinces, colour, culture/religion/ruling system/ruler title, capital and its settlement, other settlements (with their ids), guilds, bank balance, capital changes made
who <character>	Which faction and guild a character is in, and whether they lead it (name or character ID, online or not)
rename <faction> <name...>	Faction display name (id unchanged), redraws the map
renamesettlement <faction> <settlement|capital> <name...>	Renames any settlement; capital picks the faction capital. Settlement ids match without regard to case. Free, and doesn't use up the faction's free capital change
movecapital <faction> [name...]	Previews moving the capital to the province the staff member stands in, including any provinces that would be cut off. A name is needed only when no settlement exists there. It can also re-found a capital whose settlement is gone
confirm	Applies the previewed move within 60 s, only if the capital hasn't changed and the staff member is still in that province. It goes through the same journaled treasury path as /faction setcapital, at no cost, and does not count as a capital move
setcolour <faction> <R,G,B>	Same validation and uniqueness as the player command
setbanner <faction>	Uses the banner in hand
set <faction> <culture|religion|rulingsystem|rulertitle> <value...>	Free-text fields
kick <faction> <character>	Removes a member from the faction and any guild in it. Refuses the faction leader and guild leaders (use forceleader first)
quarantine ...	Unchanged, now routed through the same entry point

/guild admin: info, rename, setcolour, setbanner, kick (back to the faction's main guild). The main guild is refused with a pointer to the /faction admin equivalent.

Tab completion covers subcommands, faction and guild ids, settlement ids (plus capital), current colour, set fields and member names (multi-word too).

TreasuryTopology.capital gains an overload with countMove; the existing signature passes true, so player moves are unchanged.

Leaving a faction or guild now cleans up properly (player and staff)

Before this PR, /faction kick, /faction leave, /guild kick and /guild leave only took the character off the member list. Everything else they held stayed until they died. All of these, and both staff kicks, now go through one helper, guild/MemberDepartures:

• Leaving the realm (leaveRealm) drops:
  • guild invites, dividend eligibility and leadership offers in every guild of the realm;
  • the same political rights a death removes (Government.removeRights, which removeDeadCharacter now delegates to): council seat, proposals, election candidacy and ballots, movement and cause roles, and their vote in a sitting council session;
  • the Spymaster office, if they held it (EspionageState.vacateFor); it falls back to the leader like any vacancy;
  • their place in a faction war host, via the same path as /warband leave (CampaignWarbandBattleService.processLeave, now also callable for an offline account): leadership passes on, the battle is updated and saved. A kept rejoin place for that host is dropped. Places in a player's own warband are untouched.
• /faction leave counts as walking out, so it blocks rejoining that battle's host. A kick doesn't, so the realm can let the member back.
• Leaving a guild (leaveGuild) clears that guild's invite, dividend and leadership offer, and returns the character to the main guild.
• Mercenary company enlistment is unchanged, since it doesn't depend on faction membership.

Related fix: a guild invite received while factionless could, once accepted, pull the character out of a faction they had joined since, without any of this cleanup. Accepting it now refuses with "You belong to X. Use /faction leave first.", and the invite isn't used up.

Known, unchanged: if a departure empties a war host mid-battle, the side's auto-lose check runs. That's the same as members using /warband leave themselves.

Testing

• Unit: StaffAdminServiceTest (20) and StaffAdminCommandTest (15), with 100% line coverage of the new classes, plus a TreasuryTopologyTest case showing a staff move is free and leaves capital moves unchanged. Routing and completion tests were updated.

• Departures: MemberDeparturesTest, EspionageStateVacateTest and CampaignWarbandOfflineLeaveTest, plus new cases in WarbandMembershipServiceTest, GuildDividendEligibilityTest and GuildDeleteCommandTest (the cross-realm invite). CommandManagerCoverageTest now checks that the four player commands use the cleanup.

• Local full suite: on Windows, main already has 515 failing tests (fsync and POSIX permissions). This branch adds only the new TreasuryTopologyTest case, which fails on Windows the same way as its sibling capitalLossRevalidates.... Linux CI is authoritative.

• Review, staff commands: three rounds. Fixed along the way:

  • confirm threw when staff had no character session;
  • a capital province with no settlement couldn't be repaired;
  • banner-pattern items passed the banner check;
  • <placeholder> values were accepted;
  • clearer refusals outside any province.

• Dev (TFMCDev01), with a mineflayer staff bot and a target bot on Dev's copy of Sunsora: 54/54 checks passed.

  • Permission refusal, usage and tab completion.
  • Console renamesettlement Sunsora capital Sunsora_Castle; the web map export then showed "Sunsora Castle".
  • Lowercase settlement id; faction rename, colour (reserved and spaced input), culture, banner (with and without a banner in hand).
  • Guild info, rename, main-guild refusal, bad colour; refused leader kicks.
  • who → guild kick → faction kick, with the target told each time.
  • Capital move refusals ("already the capital", wrong province on confirm), then a move to Neo Nordbaum and back. Capital changes made stayed at 0.
  • 25 [StaffAdmin] log lines and no SimpleFactions errors. Dev's SimpleFactions data was restored afterwards.

• Dev, departures (jar 2f98c1c): the 54-check run above passed again. A second run passed 8/8:

  • a staff bot made leader of Sunsora appointed the target bot Spymaster (saved);
  • /guild leave returned the target to the main guild;
  • the leader's /faction kick removed it;
  • /faction leave worked;
  • there were no SimpleFactions errors.

  After stopping Dev, the saved faction had no Spymaster and the target was gone. Dev data was restored again.

• Review: three more rounds on the departure change. It found a dropped kept place in unrelated warbands, kicks setting the leave block, and the cross-realm invite; all fixed. The last round was clean.

• Sol review of the whole PR: round 1 found two issues, both fixed:

  • a capital confirm could act on a faction deleted and refounded under the same id within the 60 s; the pending move now holds the faction itself;
  • the console couldn't tab-complete /guild admin.

  Round 2: VERDICT: APPROVE.

• Dev, final (jar 5b5a30a): both runs passed again (54/54 and 8/8). The Spymaster was vacated by the kick and Dev data was restored.

Wiki: the staff commands are staff-only. The departure clean-up is what players would expect, and no wiki page currently says otherwise.

🤖 Generated with Claude Code

[coderabbitai]

No actionable comments were generated in the recent review.

Recent review info

Run configuration

• Source mode: Auto
• Repository: Unavailable
• Branch: Unavailable
• File: No configuration file from this repository applied
• Commit: Unavailable
• Layers: Organization UI
• Review profile: CHILL
• Plan: Advanced
• Run ID: 1ba10367-a3cb-452b-b94a-df3eb9264d80

Commits

Reviewing files that changed from the base of the PR and between ea9a3d2 and 5b5a30a.

Files selected for processing: 23

• src/main/java/net/tfminecraft/simplefactions/admin/StaffAdminCommand.java
• src/main/java/net/tfminecraft/simplefactions/admin/StaffAdminService.java
• src/main/java/net/tfminecraft/simplefactions/economy/TreasuryTopology.java
• src/main/java/net/tfminecraft/simplefactions/espionage/EspionageState.java
• src/main/java/net/tfminecraft/simplefactions/government/Government.java
• src/main/java/net/tfminecraft/simplefactions/guild/Guild.java
• src/main/java/net/tfminecraft/simplefactions/guild/MemberDepartures.java
• src/main/java/net/tfminecraft/simplefactions/managers/CommandManager.java
• src/main/java/net/tfminecraft/simplefactions/managers/InviteCommands.java
• src/main/java/net/tfminecraft/simplefactions/utils/TabCompletion.java
• src/main/java/net/tfminecraft/simplefactions/war/battle/campaign/warband/CampaignWarbandBattleService.java
• src/main/java/net/tfminecraft/simplefactions/war/battle/warband/WarbandMembershipService.java
• src/test/java/net/tfminecraft/simplefactions/admin/StaffAdminCommandTest.java
• src/test/java/net/tfminecraft/simplefactions/admin/StaffAdminServiceTest.java
• src/test/java/net/tfminecraft/simplefactions/economy/TreasuryTopologyTest.java
• src/test/java/net/tfminecraft/simplefactions/espionage/EspionageStateVacateTest.java
• src/test/java/net/tfminecraft/simplefactions/guild/GuildDeleteCommandTest.java
• src/test/java/net/tfminecraft/simplefactions/guild/GuildDividendEligibilityTest.java
• src/test/java/net/tfminecraft/simplefactions/guild/MemberDeparturesTest.java
• src/test/java/net/tfminecraft/simplefactions/managers/CommandManagerCoverageTest.java
• src/test/java/net/tfminecraft/simplefactions/managers/TabCompletionCoverageTest.java
• src/test/java/net/tfminecraft/simplefactions/war/battle/campaign/warband/CampaignWarbandOfflineLeaveTest.java
• src/test/java/net/tfminecraft/simplefactions/war/battle/warband/WarbandMembershipServiceTest.java

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

📝 Summary

Summary by CodeRabbit

• New Features
  • Added staff administration commands for managing factions and guilds, including information, member management, settings, names and appearance.
  • Added a preview and confirmation flow for staff capital moves.
  • Guild invitations to a guild in another faction no longer take effect until the player leaves their current faction.
  • Departing members are removed from related faction, guild, government, espionage and warband roles, with offline warband departures supported.
• Bug Fixes
  • Prevented guild invitations from being consumed when the player must first leave another faction’s guild.

Adds staff commands for faction and guild administration, including capital-move previews and confirmation. It centralises guild and realm departure handling, supports faction-warband removal for offline members, and checks faction membership before a guild invite is consumed.

Changes: Staff administration

Layer / File(s)	Summary
Faction and guild administration src/main/java/net/tfminecraft/simplefactions/admin/StaffAdminService.java, src/test/java/net/tfminecraft/simplefactions/admin/StaffAdminServiceTest.java	Adds faction and guild information, editing, renaming, and member-removal operations. Tests cover validation, service results, and removal cases.
Capital-move preview and confirmation src/main/java/net/tfminecraft/simplefactions/admin/StaffAdminCommand.java, src/main/java/net/tfminecraft/simplefactions/admin/StaffAdminService.java, src/main/java/net/tfminecraft/simplefactions/economy/TreasuryTopology.java, src/test/java/net/tfminecraft/simplefactions/admin/StaffAdmin*Test.java, src/test/java/net/tfminecraft/simplefactions/economy/TreasuryTopologyTest.java	Adds preview and confirmation checks for staff capital moves. Treasury capital-move counting can be disabled for these moves.
Command routing and completion src/main/java/net/tfminecraft/simplefactions/admin/StaffAdminCommand.java, src/main/java/net/tfminecraft/simplefactions/managers/CommandManager.java, src/main/java/net/tfminecraft/simplefactions/utils/TabCompletion.java, src/test/java/net/tfminecraft/simplefactions/admin/StaffAdminCommandTest.java, src/test/java/net/tfminecraft/simplefactions/managers/TabCompletionCoverageTest.java	Routes faction and guild staff commands, applies admin permission checks, and adds command-specific completions. Tests cover routing, permissions, and completion.

Member departure handling

Layer / File(s)	Summary
Faction-warband member removal src/main/java/net/tfminecraft/simplefactions/war/battle/warband/WarbandMembershipService.java, src/main/java/net/tfminecraft/simplefactions/war/battle/campaign/warband/CampaignWarbandBattleService.java, src/test/java/net/tfminecraft/simplefactions/war/battle/*/warband/*Test.java	Adds faction-warband removal for a matching character and supports leave processing when the member is offline.
Departure state cleanup src/main/java/net/tfminecraft/simplefactions/guild/MemberDepartures.java, src/main/java/net/tfminecraft/simplefactions/government/Government.java, src/main/java/net/tfminecraft/simplefactions/espionage/EspionageState.java, src/main/java/net/tfminecraft/simplefactions/guild/Guild.java, src/test/java/net/tfminecraft/simplefactions/guild/*Test.java, src/test/java/net/tfminecraft/simplefactions/espionage/EspionageStateVacateTest.java	Adds shared guild and realm departure operations. Departure cleanup removes government rights and espionage roles, and clears guild invites, dividend eligibility, and matching leadership offers.
Departure command integration src/main/java/net/tfminecraft/simplefactions/managers/CommandManager.java, src/test/java/net/tfminecraft/simplefactions/managers/CommandManagerCoverageTest.java	Routes guild leave and kick, and faction leave and kick, through the shared departure operations.

Guild invite membership check

Layer / File(s)	Summary
Cross-faction guild invite check src/main/java/net/tfminecraft/simplefactions/managers/InviteCommands.java, src/test/java/net/tfminecraft/simplefactions/guild/GuildDeleteCommandTest.java, src/test/java/net/tfminecraft/simplefactions/managers/CommandManagerCoverageTest.java	Checks whether the current guild belongs to another faction before consuming the target guild’s invite. Tests verify that the current guild is not left and the invite is not consumed.

Priority: Normal

Estimated code review effort: 4 (Complex) | ~60 minutes

Change: Feature

Sequence Diagram(s)

sequenceDiagram
  participant StaffPlayer
  participant StaffAdminCommand
  participant StaffAdminService
  participant TreasuryTopology
  StaffPlayer->>StaffAdminCommand: Request capital-move preview
  StaffAdminCommand->>StaffAdminService: previewCapital(...)
  StaffAdminService-->>StaffAdminCommand: Return CapitalMove or validation lines
  StaffAdminCommand-->>StaffPlayer: Show preview
  StaffPlayer->>StaffAdminCommand: Confirm capital move
  StaffAdminCommand->>StaffAdminService: moveCapital(..., standing)
  StaffAdminService->>TreasuryTopology: Apply existing-capital move with countMove false
  TreasuryTopology-->>StaffAdminService: Return move result
  StaffAdminService-->>StaffAdminCommand: Return result lines
  StaffAdminCommand-->>StaffPlayer: Show result

Loading

Possibly related PRs

• TF-Minecraft/SimpleFactions#202: Changes the guild lookup path used by the staff command’s /guild admin targets and completions.

Suggested labels: size:L

Suggested reviewers: ryanbarlow97

Merge Risk: Minimal · up to 5b5a3

This PR adds staff faction and guild administration commands and routes member departures through shared cleanup. No concrete merge-blocking defect was found in the supplied evidence, and the commands and departure paths have unit and routing coverage.

- [ ] Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[XxFran10xX]

@coderabbitai review

[coderabbitai]

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.