Skip to content

Commit a99ce4f

Browse files
joligariofryguy503
andauthored
[Bug Fix] Revert 2df7d19 (#4101)
* [Bug Fix] Revert 2df7d19 This change breaks lich-type spells as seen in #4098. Per comment on original change, also don't see where Runes come into play. * Revert invis change * [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. --------- Co-authored-by: Trust <[email protected]>
1 parent dcfc54d commit a99ce4f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

zone/attack.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -4071,6 +4071,10 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
40714071

40724072
//see if any runes want to reduce this damage
40734073
if (!IsValidSpell(spell_id)) {
4074+
if (IsClient()) {
4075+
CommonBreakInvisible();
4076+
}
4077+
40744078
damage = ReduceDamage(damage);
40754079
LogCombat("Melee Damage reduced to [{}]", damage);
40764080
damage = ReduceAllDamage(damage);
@@ -4102,8 +4106,9 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
41024106
TryTriggerThreshHold(damage, SE_TriggerSpellThreshold, attacker);
41034107
}
41044108

4105-
if (IsClient()) {
4106-
CommonBreakInvisible();
4109+
if (IsClient() && CastToClient()->sneaking) {
4110+
CastToClient()->sneaking = false;
4111+
SendAppearancePacket(AppearanceType::Sneak, 0);
41074112
}
41084113

41094114
if (attacker && attacker->IsClient() && attacker->CastToClient()->sneaking) {

0 commit comments

Comments
 (0)