pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 02:31:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix (faction)] Do not award faction if NPC is charmed. (#1945)

Browse Source 
* Do not award faction if npc is charmed.

* No faction on kill of charmed mob or questreward of same
This commit is contained in:
Paul Coene
2022-01-26 18:17:25 -05:00
committed by GitHub
parent b9722c6d28
commit e850d80656
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+2 -2
View File
@@ -8678,7 +8678,7 @@ void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold,
if (faction)
{
if (target && target->IsNPC())
if (target && target->IsNPC() && !target->IsCharmed())
{
int32 nfl_id = target->CastToNPC()->GetNPCFactionID();
SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true);
@@ -8714,7 +8714,7 @@ void Client::QuestReward(Mob* target, const QuestReward_Struct &reward, bool fac
if (faction)
{
if (target && target->IsNPC())
if (target && target->IsNPC() && !target->IsCharmed())
{
int32 nfl_id = target->CastToNPC()->GetNPCFactionID();
SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true);