From 2c141c1059afb2ed102cb34318cdd32812a0159f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 22 May 2023 13:23:09 +0800
Subject: [PATCH] 1

---
 server/gameserver/mt/MergeItem.cc | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/mt/MergeItem.cc b/server/gameserver/mt/MergeItem.cc
index a353e476..1a551074 100644
--- a/server/gameserver/mt/MergeItem.cc
+++ b/server/gameserver/mt/MergeItem.cc
@@ -10,8 +10,20 @@ namespace mt
     void MergeItem::Init1()
     {
         {
-            std::vector<std::string> strings;
-            a8::Split(pickup3(), strings, '|');
+            std::set<int> buffs;
+            {
+                std::vector<std::string> strings;
+                a8::Split(pickup3(), strings, '|');
+                for (auto& str : strings) {
+                    if (!str.empty()) {
+                        if (str.at(0) == '-') {
+                            buffs.erase(-a8::XValue(str).GetInt());
+                        } else {
+                            buffs.insert(a8::XValue(str).GetInt());
+                        }
+                    }
+                }
+            }
         }
     }