fix: packet parseRemoveMagicEffect (#1070)

mehah · Jan 28, 2025 · a5dd721 · a5dd721
1 parent 90b4062
commit a5dd721
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua
@@ -232,8 +232,8 @@ function onSpellGroupCooldown(groupId, duration)
         removeEvent(icon.event)
     end
 
-    progressRect.icon = icon
     if progressRect then
+        progressRect.icon = icon
         removeEvent(progressRect.event)
         local updateFunc = function()
             updateCooldown(progressRect, duration)

diff --git a/src/client/protocolgame.h b/src/client/protocolgame.h
@@ -226,6 +226,7 @@ class ProtocolGame final : public Protocol
     void parseCloseNpcTrade(const InputMessagePtr&);
     void parseWorldLight(const InputMessagePtr& msg);
     void parseMagicEffect(const InputMessagePtr& msg);
+    void parseRemoveMagicEffect(const InputMessagePtr& msg);
     void parseAnimatedText(const InputMessagePtr& msg);
     void parseDistanceMissile(const InputMessagePtr& msg);
     void parseAnthem(const InputMessagePtr& msg);

diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp
@@ -250,7 +250,11 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
                     parseMagicEffect(msg);
                     break;
                 case Proto::GameServerTextEffect:
-                    parseAnimatedText(msg);
+                    if (g_game.getClientVersion() >= 1320) {
+                        parseRemoveMagicEffect(msg);
+                    } else {
+                        parseAnimatedText(msg);
+                    }
                     break;
                 case Proto::GameServerMissleEffect:
                     if (g_game.getFeature(Otc::GameAnthem)) {
@@ -1706,6 +1710,17 @@ void ProtocolGame::parseMagicEffect(const InputMessagePtr& msg)
     g_map.addThing(effect, pos);
 }
 
+void ProtocolGame::parseRemoveMagicEffect(const InputMessagePtr& msg)
+{
+    getPosition(msg);
+    uint16_t effectId = g_game.getFeature(Otc::GameEffectU16) ? msg->getU16() : msg->getU8();
+    if (!g_things.isValidDatId(effectId, ThingCategoryEffect)) {
+        g_logger.warning(stdext::format("[ProtocolGame::parseRemoveMagicEffect] - Invalid effectId type {}", effectId));
+        return;
+    }
+    // TO-DO
+}
+
 void ProtocolGame::parseAnimatedText(const InputMessagePtr& msg)
 {
     const auto& position = getPosition(msg);