From 2bc2235179c2046c2150e1b6dc2db485d9987fd8 Mon Sep 17 00:00:00 2001 From: gsemaj Date: Tue, 25 Jul 2023 19:11:28 +0000 Subject: [PATCH] Fix icon not disappearing for debuffs --- src/Abilities.cpp | 2 +- src/Buffs.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Abilities.cpp b/src/Abilities.cpp index d1fa9a4..929a4a3 100644 --- a/src/Abilities.cpp +++ b/src/Abilities.cpp @@ -69,7 +69,7 @@ static SkillResult handleSkillDamageNDebuff(SkillData* skill, int power, ICombat if(status == ETBU_DEL) Buffs::timeBuffTimeout(self); }, [](EntityRef self, Buff* buff, time_t currTime) { - //Buffs::timeBuffTick(self, buff); + Buffs::timeBuffTick(self, buff); }, &debuff); } diff --git a/src/Buffs.cpp b/src/Buffs.cpp index 2b42e15..c5fd82a 100644 --- a/src/Buffs.cpp +++ b/src/Buffs.cpp @@ -155,7 +155,8 @@ void Buffs::timeBuffTimeout(EntityRef self) { Entity* entity = self.getEntity(); ICombatant* combatant = dynamic_cast(entity); INITSTRUCT(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT, pkt); // send a buff timeout to other players - pkt.eCT = combatant->getCharType(); + int32_t eCharType = combatant->getCharType(); + pkt.eCT = eCharType == 4 ? 2 : eCharType; // convention not followed by client here pkt.iID = combatant->getID(); pkt.iConditionBitFlag = combatant->getCompositeCondition(); NPCManager::sendToViewable(entity, &pkt, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT));