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

fix(Core/Events): Apothecary Hummel (#10615)

Browse source 
* Fix(Core/Events): Apothecary Hummel

Co-authored-by: sirikfoll <sirikfoll@hotmail.com>
Co-authored-by: Killyana <Killyana@users.noreply.github.com>

* missed return

* Missing include

* Fixed delete

Co-authored-by: sirikfoll <sirikfoll@hotmail.com>
Co-authored-by: Killyana <Killyana@users.noreply.github.com>
This commit is contained in:
Nefertumm 2022-02-11 06:00:10 -03:00 • committed by GitHub
parent 5d8b472ed7
commit c9ac48e824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 862 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13193,7 +13193,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
|| (!target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC))
|| (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC))
// check if this is a world trigger cast - GOs are using world triggers to cast their spells, so we need to ignore their immunity flag here, this is a temp workaround, needs removal when go cast is implemented properly
|| (GetEntry() != WORLD_TRIGGER && target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC)))
|| ((GetEntry() != WORLD_TRIGGER && (!obj || !obj->isType(TYPEMASK_GAMEOBJECT | TYPEMASK_DYNAMICOBJECT))) && target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC)))
return false;
// CvC case - can attack each other only when one of them is hostile