Skip to content

fix: keep players in the faction when they leave or are kicked from a guild - #204

Merged
XxFran10xX merged 1 commit into
mainfrom
guild-leave-main-guild
Oct 23, 2026
Merged

XxFran10xX merged 1 commit into
mainfrom
guild-leave-main-guild

Conversation

@XxFran10xX

Copy link
Copy Markdown
Contributor

Leaving or being kicked from a guild no longer removes you from the faction.

Faction membership is the members of all its guilds, so /guild leave and /guild kick used to take the player out of the whole faction. fran confirmed that's not intended: you should stay in the faction, in its main guild.

  • /guild leave (in a guild other than the main one) moves you back to the faction's main guild and says so.
  • /guild kick does the same for the kicked member, and tells them they're back in the main guild. A guild leader can no longer expel someone from the faction; that stays with /faction kick.
  • /guild leave in the main guild now points to /faction leave instead of silently leaving the faction.
  • /faction leave for a guild member now says: "Use /guild leave first, then /faction leave".

Tests: GuildKickCommandTest and CommandManagerCoverageTest updated (kick and leave verify addMember on the faction; new main-guild case). Locally both suites pass apart from two forced-withdrawal tests in CommandManagerCoverageTest that also fail on unmodified main on this Windows PC.

No version bump or release in this PR.

🤖 Generated with Claude Code

… guild

/guild leave and /guild kick removed the player from their guild, and since
faction membership is the members of its guilds, from the whole faction too.
They now return the player to the faction's main guild. In the main guild,
/guild leave points to /faction leave, and /faction leave tells guild members
to leave their guild first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 23, 2026

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ 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: 9e03290f-f857-4fd8-9ac9-ce4a8f7090d9
  • 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

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

@github-actions github-actions Bot added the size:S 10-29 effective changed lines (tests excluded in mixed PRs). label Oct 23, 2026
@XxFran10xX
XxFran10xX merged commit 759e662 into main Oct 23, 2026
3 checks passed
@XxFran10xX
XxFran10xX deleted the guild-leave-main-guild branch October 23, 2026 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 effective changed lines (tests excluded in mixed PRs).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant