fix(Core/Players): Charmed players should not attack critters. (#15358)

This commit is contained in:
UltraNix
2023-03-13 12:15:10 +01:00
committed by GitHub
parent 3d5ec682c0
commit 2641459304

View File

@@ -860,7 +860,7 @@ namespace Acore
AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {}
bool operator()(Unit* u)
{
if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u) &&
if (u->IsAlive() && !u->IsCritter() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u) &&
(i_funit->GetTypeId() != TYPEID_UNIT || !i_funit->ToCreature()->IsAvoidingAOE())) // pussywizard
return true;
else