Skip to content

Fix possible occupation-escape exploit via merge#981

Merged
Goosius1 merged 1 commit intoTownyAdvanced:masterfrom
Goosius1:fix_merge_escape
Oct 1, 2025
Merged

Fix possible occupation-escape exploit via merge#981
Goosius1 merged 1 commit intoTownyAdvanced:masterfrom
Goosius1:fix_merge_escape

Conversation

@Goosius1
Copy link
Copy Markdown
Collaborator

@Goosius1 Goosius1 commented Oct 1, 2025

Description:

Note: Still in draft state, not ready for review until #980 is merged

Fixes a possible occupation-escape exploit


New Nodes/Commands/ConfigOptions:

N/A


Relevant Issue ticket:

Closes #910


  • [ N/A seems simple enough to be ok ] I have tested this pull request for defects on a server.

By making this pull request, I represent that I have the right to waive copyright and related rights to my contribution, and agree that all copyright and related rights in my contributions are waived, and I acknowledge that the TownyAdvanced organization has the copyright to use and modify my contribution under the SiegeWar License for perpetuity.

@Goosius1 Goosius1 self-assigned this Oct 1, 2025
Copy link
Copy Markdown
Member

@LlmDl LlmDl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two classes have only unneeded diffs

@LlmDl LlmDl added this to the 3.0.0 milestone Oct 1, 2025
@Goosius1 Goosius1 marked this pull request as ready for review October 1, 2025 19:39
@Goosius1 Goosius1 merged commit 2296fa3 into TownyAdvanced:master Oct 1, 2025
@Goosius1 Goosius1 deleted the fix_merge_escape branch October 1, 2025 19:40
@Goosius1
Copy link
Copy Markdown
Collaborator Author

Goosius1 commented Oct 1, 2025

Thanks for all the reviews!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Prevent town deletion, merges and mayor change during occupation

2 participants