Merge pull request #986 from regneq/master

Faction conning indifferent regardless of faction level in no-combat zones.
This commit is contained in:
Michael Cook (mackal)
2020-03-07 22:01:26 -05:00
committed by GitHub
+2
View File
@@ -7797,6 +7797,8 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra
// few optimizations
if (GetFeigned())
return FACTION_INDIFFERENT;
if(!zone->CanDoCombat())
return FACTION_INDIFFERENT;
if (invisible_undead && tnpc && !tnpc->SeeInvisibleUndead())
return FACTION_INDIFFERENT;
if (IsInvisible(tnpc))