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

Merge pull request #794 from noudess/master

Browse Source 
Small fix for an NPC on a faction but with no entries in npc_faction_entries
This commit is contained in:
Michael Cook (mackal) 2018-12-06 19:44:17 -05:00 committed by GitHub
commit a4a69be0f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/npc.cpp
View File

@ -2632,7 +2632,16 @@ FACTION_VALUE NPC::CheckNPCFactionAlly(int32 other_faction) {
return FACTION_INDIFFERENT; return FACTION_INDIFFERENT;
} }
} }
return FACTION_INDIFFERENT;
// I believe that the assumption is, barring no entry in npc_faction_entries
// that two npcs on like faction con ally to each other. This catches cases
// where an npc is on a faction but has no hits (hence no entry in
// npc_faction_entries).
if (GetPrimaryFaction() == other_faction)
return FACTION_ALLY;
else
return FACTION_INDIFFERENT;
} }
bool NPC::IsFactionListAlly(uint32 other_faction) { bool NPC::IsFactionListAlly(uint32 other_faction) {
@ -2820,4 +2829,4 @@ void NPC::ModifyStatsOnCharm(bool bRemoved)
// the rest of the stats aren't cached, so lets just do these two instead of full CalcBonuses() // the rest of the stats aren't cached, so lets just do these two instead of full CalcBonuses()
SetAttackTimer(); SetAttackTimer();
CalcAC(); CalcAC();
} }