ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Units): Include charmed creatures in damagedByPlayer check (#25171)

Browse source 
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Andrew 2026-04-04 00:09:27 -03:00 • committed by GitHub
parent 4a49d525b5
commit b53011c5ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server/game/Entities/Unit/Unit.cpp
View file

@ -1204,7 +1204,8 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage
if (!attacker || attacker->IsControlledByPlayer() || attacker->IsCreatedByPlayer()) if (!attacker || attacker->IsControlledByPlayer() || attacker->IsCreatedByPlayer())
{ {
uint32 unDamage = health < damage ? health : damage; uint32 unDamage = health < damage ? health : damage;
bool damagedByPlayer = unDamage && attacker && (attacker->IsPlayer() || attacker->m_movedByPlayer != nullptr); bool damagedByPlayer = unDamage && attacker && (attacker->IsPlayer() || attacker->m_movedByPlayer != nullptr
|| attacker->GetCharmerOrOwnerGUID().IsPlayer());
victim->ToCreature()->LowerPlayerDamageReq(unDamage, damagedByPlayer); victim->ToCreature()->LowerPlayerDamageReq(unDamage, damagedByPlayer);
} }
} }