pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/attack.cpp
View File

@ -2411,7 +2411,7 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQ::skills::SkillTy
give_exp_client = give_exp->CastToClient(); give_exp_client = give_exp->CastToClient();
//do faction hits even if we are a merchant, so long as a player killed us //do faction hits even if we are a merchant, so long as a player killed us
if (give_exp_client && !RuleB(NPC, EnableMeritBasedFaction)) if (!IsCharmed() && give_exp_client && !RuleB(NPC, EnableMeritBasedFaction))
hate_list.DoFactionHits(GetNPCFactionID()); hate_list.DoFactionHits(GetNPCFactionID());
bool IsLdonTreasure = (this->GetClass() == LDON_TREASURE); bool IsLdonTreasure = (this->GetClass() == LDON_TREASURE);

4
zone/client.cpp
View File

@ -8678,7 +8678,7 @@ void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold,
if (faction) if (faction)
{ {
if (target && target->IsNPC()) if (target && target->IsNPC() && !target->IsCharmed())
{ {
int32 nfl_id = target->CastToNPC()->GetNPCFactionID(); int32 nfl_id = target->CastToNPC()->GetNPCFactionID();
SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true); 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 (faction)
{ {
if (target && target->IsNPC()) if (target && target->IsNPC() && !target->IsCharmed())
{ {
int32 nfl_id = target->CastToNPC()->GetNPCFactionID(); int32 nfl_id = target->CastToNPC()->GetNPCFactionID();
SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true); SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true);

3
zone/questmgr.cpp
View File

@ -1353,7 +1353,8 @@ void QuestManager::save() {
void QuestManager::faction(int faction_id, int faction_value, int temp) { void QuestManager::faction(int faction_id, int faction_value, int temp) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (initiator && initiator->IsClient()) { running_quest run = quests_running_.top();
if(run.owner->IsCharmed() == false && initiator && initiator->IsClient()) {
if(faction_id != 0 && faction_value != 0) { if(faction_id != 0 && faction_value != 0) {
initiator->SetFactionLevel2( initiator->SetFactionLevel2(
initiator->CharacterID(), initiator->CharacterID(),