From 8e5bf8d58f3ddcb82f758669043bf17c167c1c2d Mon Sep 17 00:00:00 2001 From: JJ Date: Mon, 19 Feb 2024 07:02:06 -0500 Subject: [PATCH 1/3] [Bug Fix] Revert https://github.com/EQEmu/Server/commit/2df7d19f975cb21dd4eb7d6c7d40656cf58ed138 This change breaks lich-type spells as seen in #4098. Per comment on original change, also don't see where Runes come into play. --- zone/attack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 3581054bd7..ae22a02736 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4103,7 +4103,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons } if (IsClient()) { - CommonBreakInvisible(); + //CommonBreakInvisible(); } if (attacker && attacker->IsClient() && attacker->CastToClient()->sneaking) { From c56d480d073169478908005b68095e65a4044b9e Mon Sep 17 00:00:00 2001 From: JJ Date: Mon, 19 Feb 2024 07:07:34 -0500 Subject: [PATCH 2/3] Revert invis change --- zone/attack.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index ae22a02736..2af933caac 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4102,8 +4102,9 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons TryTriggerThreshHold(damage, SE_TriggerSpellThreshold, attacker); } - if (IsClient()) { - //CommonBreakInvisible(); + if (IsClient() && CastToClient()->sneaking) { + CastToClient()->sneaking = false; + SendAppearancePacket(AppearanceType::Sneak, 0); } if (attacker && attacker->IsClient() && attacker->CastToClient()->sneaking) { From c4c5bfd54cc2e2cedd769a56356fc3b4a846f122 Mon Sep 17 00:00:00 2001 From: Trust Date: Mon, 19 Feb 2024 22:18:48 -0500 Subject: [PATCH 3/3] [Bug Fix] Correct Rune damage check location for invis break. Correct the location of the CommonBreakInvis for runes. Appologize for the incorrect location. Thank you JJ for pointing me to the PR that caused the issue. --- zone/attack.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zone/attack.cpp b/zone/attack.cpp index 2af933caac..a276f4d850 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4071,6 +4071,10 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons //see if any runes want to reduce this damage if (!IsValidSpell(spell_id)) { + if (IsClient()) { + CommonBreakInvisible(); + } + damage = ReduceDamage(damage); LogCombat("Melee Damage reduced to [{}]", damage); damage = ReduceAllDamage(damage);