From 554b41d42499b395fff644fe0efe723f72adcf19 Mon Sep 17 00:00:00 2001 From: Aeadoin <109764533+Aeadoin@users.noreply.github.com> Date: Wed, 28 Sep 2022 22:03:26 -0400 Subject: [PATCH] [Feature] Change Lifetap Emotes to be filterable. (#2454) --- zone/attack.cpp | 2 +- zone/bot.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 3f91a2f52..789ef95d5 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -3704,7 +3704,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons //we used to do a message to the client, but its gone now. // emote goes with every one ... even npcs - entity_list.MessageClose(this, false, RuleI(Range, SpellMessages), Chat::Emote, "%s beams a smile at %s", attacker->GetCleanName(), GetCleanName()); + entity_list.FilteredMessageClose(this, false, RuleI(Range, SpellMessages), Chat::Emote, FilterSocials, "%s beams a smile at %s", attacker->GetCleanName(), GetCleanName()); } // If a client pet is damaged while sitting, stand, fix sit button, diff --git a/zone/bot.cpp b/zone/bot.cpp index 1fbc3ffe1..ac3f7d968 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -5025,7 +5025,7 @@ void Bot::Damage(Mob *from, int64 damage, uint16 spell_id, EQ::skills::SkillType int64 healed = GetActSpellHealing(spell_id, damage); LogCombat("Applying lifetap heal of [{}] to [{}]", healed, GetCleanName()); HealDamage(healed); - entity_list.MessageClose(this, true, 300, Chat::Spells, "%s beams a smile at %s", GetCleanName(), from->GetCleanName() ); + entity_list.FilteredMessageClose(this, true, RuleI(Range, SpellMessages), Chat::Emote, FilterSocials, "%s beams a smile at %s", GetCleanName(), from->GetCleanName() ); } CommonDamage(from, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic, special);