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

[Bug Fix] Restore missing messages for lifetap and dmg spells. (#2057)

Browse Source 
* [Bug Fix] Restore missing messages for lifetap and dmg spells.

* Fix unintended duplicate message for DD on clients.

* Improve performance and accuracy of IsDamageSpell()
This commit is contained in:
Paul Coene 2022-04-13 23:11:26 -04:00 committed by GitHub
parent a6814d46de
commit ee54a7eb5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/spdat.cpp
View File

@ -139,11 +139,13 @@ bool IsEvacSpell(uint16 spellid)
bool IsDamageSpell(uint16 spellid) bool IsDamageSpell(uint16 spellid)
{ {
if (spells[spellid].target_type == ST_Tap)
return false;
for (int o = 0; o < EFFECT_COUNT; o++) { for (int o = 0; o < EFFECT_COUNT; o++) {
uint32 tid = spells[spellid].effect_id[o]; uint32 tid = spells[spellid].effect_id[o];
if ((tid == SE_CurrentHPOnce || tid == SE_CurrentHP) && if (spells[spellid].base_value[o] < 0 &&
spells[spellid].target_type != ST_Tap && spells[spellid].buff_duration < 1 && ((tid == SE_CurrentHPOnce) || (tid == SE_CurrentHP && spells[spellid].buff_duration < 1)))
spells[spellid].base_value[o] < 0)
return true; return true;
} }

26
zone/spells.cpp
View File

@ -3491,6 +3491,8 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, int reflect_effectiveness, bool use_resist_adjust, int16 resist_adjust, bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, int reflect_effectiveness, bool use_resist_adjust, int16 resist_adjust,
bool isproc, int level_override, int32 duration_override, bool disable_buff_overrwrite) bool isproc, int level_override, int32 duration_override, bool disable_buff_overrwrite)
{ {
auto spellOwner = GetOwnerOrSelf();
// well we can't cast a spell on target without a target // well we can't cast a spell on target without a target
if(!spelltar) if(!spelltar)
{ {
@ -3595,7 +3597,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, int reflect_effectivenes
RuleI(Range, SpellMessages), RuleI(Range, SpellMessages),
this, /* Skip this Mob */ this, /* Skip this Mob */
true, /* Packet ACK */ true, /* Packet ACK */
(spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells) /* EQ Filter Type: (8 or 9) */ (spellOwner->IsClient() ? FilterPCSpells : FilterNPCSpells) /* EQ Filter Type: (8 or 9) */
); );
/* Send the EVENT_CAST_ON event */ /* Send the EVENT_CAST_ON event */
@ -4118,7 +4120,6 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, int reflect_effectivenes
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 */
@ -4127,15 +4128,20 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, int reflect_effectivenes
RuleI(Range, SpellMessages), RuleI(Range, SpellMessages),
0, /* Skip this mob */ 0, /* Skip this mob */
true, /* Packet ACK */ true, /* Packet ACK */
(spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells) /* Message Filter Type: (8 or 9) */ (spellOwner->IsClient() ? FilterPCSpells : FilterNPCSpells) /* Message Filter Type: (8 or 9) */
);
} else if (is_damage_or_lifetap_spell && spellOwner->IsClient()) {
spellOwner->CastToClient()->QueuePacket(
message_packet,
true,
Mob::CLIENT_CONNECTINGALL,
(spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells)
); );
} else if (is_damage_or_lifetap_spell) {
// Sends the client owner a message like "%T staggers"
if (spellOwner->IsClient()) {
spellOwner->CastToClient()->QueuePacket(message_packet, true,
Mob::CLIENT_CONNECTINGALL, FilterPCSpells);
}
// Show the "you feel your life force drain away" on target client...
if (IsLifetapSpell(spell_id) && spelltar->IsClient()) {
spelltar->CastToClient()->QueuePacket(message_packet, true,
Mob::CLIENT_CONNECTINGALL,
(spellOwner->IsClient() ? FilterPCSpells : FilterNPCSpells));
}
} }
safe_delete(action_packet); safe_delete(action_packet);
safe_delete(message_packet); safe_delete(message_packet);