From c3bbf05b1561e004e0fcde45f8c27f4e60081fd3 Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Tue, 16 Apr 2024 10:21:48 -0300 Subject: [PATCH] fix: no removable conditions on death --- src/creatures/combat/condition.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/creatures/combat/condition.cpp b/src/creatures/combat/condition.cpp index 74eded14e1f..cb39c9c79d2 100644 --- a/src/creatures/combat/condition.cpp +++ b/src/creatures/combat/condition.cpp @@ -324,7 +324,14 @@ bool Condition::isRemovableOnDeath() const { return false; } - if (conditionType == CONDITION_SPELLCOOLDOWN || conditionType == CONDITION_SPELLGROUPCOOLDOWN || conditionType == CONDITION_MUTED) { + static const std::unordered_set nonRemovableConditions = { + CONDITION_SPELLCOOLDOWN, + CONDITION_SPELLGROUPCOOLDOWN, + CONDITION_MUTED, + CONDITION_GOSHNARTAINT + }; + + if (nonRemovableConditions.find(conditionType) != nonRemovableConditions.end()) { return false; }