Repository navigation
fix(castle-siege): prevent damage between players of the same siege side - #1349
Open
icheat2win wants to merge 4 commits into
Open
icheat2win wants to merge 4 commits into
icheat2win wants to merge 4 commits into
Conversation
Adds the IPlayerAttackRestrictionPlugIn point, which can prevent a player (or the owner of an attacking pet) from damaging another player. The Castle Siege plugin uses it to stop friendly fire between players of the same side during the battle. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011xNc764bgrPZRQYCRzPj1x
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011xNc764bgrPZRQYCRzPj1x
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 24 |
| Duplication | 7 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
…friendly-fire # Conflicts: # docs-website/docs/server-features/castle-siege.md # src/GameLogic/CastleSiege/CastleSiegeContext.cs # src/GameLogic/CastleSiege/CastleSiegePlugIn.cs
This branch has not been deployed
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.
Part of the Castle Siege epic (#735).
Problem
During the battle, players of the same siege side could damage each other, including with area skills. Only the catapults checked sides.
Change
IPlayerAttackRestrictionPlugIn(fresh GUID).Player.AttackByAsyncasks it before calculating damage, with the attacking player or the owner of the attacking pet (IPlayerSurrogate), and returns no hit when a plugin cancels.CastleSiegeContext.AreOnSameSide: both players on the Castle Siege map duringStart, with the same, non-empty side.CastleSiegePlugInimplements the new point and cancels attacks between the same side.There was no existing seam for "may this player damage that player", so this adds one rather than putting a Castle Siege special case into
Player.Tests
New
CastleSiegeFriendlyFireTests(3 tests): side combinations, leaving the map, outside the battle, a blocked attack on an ally leaves the health unchanged, an attack on an enemy still hits.Ran the full
MUnique.OpenMU.Testssuite with--no-build: 2445 passed, 2 skipped. Not verified with a game client.Generated by Claude Code