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

Merge pull request #1038 from alimalkhalifa/fix_charm_break_during_cast_lifetap_nuke

Browse Source 
Fix edge case with NPC pet owners charming PCs
This commit is contained in:
Michael Cook (mackal) 2020-04-17 14:19:13 -04:00 committed by GitHub
commit 874ca053f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/spells.cpp
View File

@ -3979,6 +3979,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
cd->hit_heading = action->hit_heading; cd->hit_heading = action->hit_heading;
cd->hit_pitch = action->hit_pitch; cd->hit_pitch = action->hit_pitch;
cd->damage = 0; cd->damage = 0;
auto spellOwner = GetOwnerOrSelf();
if(!IsEffectInSpell(spell_id, SE_BindAffinity) && !is_damage_or_lifetap_spell){ if(!IsEffectInSpell(spell_id, SE_BindAffinity) && !is_damage_or_lifetap_spell){
entity_list.QueueCloseClients( entity_list.QueueCloseClients(
spelltar, /* Sender */ spelltar, /* Sender */
@ -3989,14 +3991,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
true, /* Packet ACK */ true, /* Packet ACK */
(spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells) /* Message Filter Type: (8 or 9) */ (spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells) /* Message Filter Type: (8 or 9) */
); );
} else if (is_damage_or_lifetap_spell && } else if (is_damage_or_lifetap_spell && spellOwner->IsClient()) {
(IsClient() || spellOwner->CastToClient()->QueuePacket(
(HasOwner() &&
GetOwner()->IsClient()
)
)
) {
(HasOwner() ? GetOwner() : this)->CastToClient()->QueuePacket(
message_packet, message_packet,
true, true,
Mob::CLIENT_CONNECTINGALL, Mob::CLIENT_CONNECTINGALL,