pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-21 10:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #986 from regneq/master

Browse Source 
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
commit 1d907564e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client.cpp
View File

@ -7797,6 +7797,8 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra
// few optimizations // few optimizations
if (GetFeigned()) if (GetFeigned())
return FACTION_INDIFFERENT; return FACTION_INDIFFERENT;
if(!zone->CanDoCombat())
return FACTION_INDIFFERENT;
if (invisible_undead && tnpc && !tnpc->SeeInvisibleUndead()) if (invisible_undead && tnpc && !tnpc->SeeInvisibleUndead())
return FACTION_INDIFFERENT; return FACTION_INDIFFERENT;
if (IsInvisible(tnpc)) if (IsInvisible(tnpc))