fix: close the remaining dual-faction paths from #166 - #174
Merged
Conversation
📝 WalkthroughWalkthroughModifies CFBG faction consistency repair to resync faction for non-GM players with mismatched race factions, adds charm aura removal in ClearFakePlayer, introduces a new DropFakePlayerRecord method that erases fake player records without state restoration, and wires it into WG logout handling during war time. ChangesCFBG fake player and faction repair
Estimated code review effort: 3 (Moderate) | ~20 minutes Sequence Diagram(s)sequenceDiagram
participant Player
participant CFBG_Player
participant CFBG
Player->>CFBG_Player: OnPlayerLogout
alt WG battlefield not in war time
CFBG_Player->>CFBG: ClearFakePlayer(player)
CFBG-->>Player: restore real race/morph/faction
else WG battlefield in war time
CFBG_Player->>CFBG: DropFakePlayerRecord(player)
CFBG-->>Player: erase fake record only
end
Possibly related PRs
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@src/CFBG.cpp`:
- Around line 335-339: The faction repair in CFBG::SetFactionForRace should also
respect active charm state, not just Game Master or SPELL_AURA_MOD_FACTION.
Update the guard so that when player->IsCharmed() is true, this recovery path is
skipped and does not overwrite the faction currently controlled by the charm.
Keep the existing race/faction comparison logic intact, but add the charm check
alongside the existing IsGameMaster and aura condition near the
SetFactionForRace call site.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 7f90ff49-465f-46f2-bdea-7600ecf473e6
📒 Files selected for processing (3)
src/CFBG.cppsrc/CFBG.hsrc/CFBG_SC.cpp
Comment on lines
+335
to
+339
| if (!player->IsGameMaster() && !player->HasAuraType(SPELL_AURA_MOD_FACTION)) | ||
| { | ||
| ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(player->getRace(true)); | ||
| if (raceEntry && player->GetFaction() != raceEntry->FactionID) | ||
| SetFactionForRace(player, player->getRace(true), player->GetTeamId(true)); |
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Treat active charm as a legitimate faction writer here.
ClearFakePlayer now documents charm as owning/restoring faction state, but this repair path only skips GM and SPELL_AURA_MOD_FACTION. If a native player is actively charmed, this can overwrite the charm-owned faction before the charm ends; skip this repair while player->IsCharmed().
Proposed fix
- if (!player->IsGameMaster() && !player->HasAuraType(SPELL_AURA_MOD_FACTION))
+ if (!player->IsGameMaster() && !player->IsCharmed() && !player->HasAuraType(SPELL_AURA_MOD_FACTION))📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| if (!player->IsGameMaster() && !player->HasAuraType(SPELL_AURA_MOD_FACTION)) | |
| { | |
| ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(player->getRace(true)); | |
| if (raceEntry && player->GetFaction() != raceEntry->FactionID) | |
| SetFactionForRace(player, player->getRace(true), player->GetTeamId(true)); | |
| if (!player->IsGameMaster() && !player->IsCharmed() && !player->HasAuraType(SPELL_AURA_MOD_FACTION)) | |
| { | |
| ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(player->getRace(true)); | |
| if (raceEntry && player->GetFaction() != raceEntry->FactionID) | |
| SetFactionForRace(player, player->getRace(true), player->GetTeamId(true)); |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@src/CFBG.cpp` around lines 335 - 339, The faction repair in
CFBG::SetFactionForRace should also respect active charm state, not just Game
Master or SPELL_AURA_MOD_FACTION. Update the guard so that when
player->IsCharmed() is true, this recovery path is skipped and does not
overwrite the faction currently controlled by the charm. Keep the existing
race/faction comparison logic intact, but add the charm check alongside the
existing IsGameMaster and aura condition near the SetFactionForRace call site.
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
1 participant
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.
Summary by CodeRabbit