From 06b361f966ea24d37b6cef5af8f4b9a08eec35f0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 22 May 2023 13:20:29 +0800
Subject: [PATCH] 1

---
 server/gameserver/mt/MergeItem.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/mt/MergeItem.cc b/server/gameserver/mt/MergeItem.cc
index 8788aecc..a353e476 100644
--- a/server/gameserver/mt/MergeItem.cc
+++ b/server/gameserver/mt/MergeItem.cc
@@ -9,11 +9,16 @@ namespace mt
 
     void MergeItem::Init1()
     {
+        {
+            std::vector<std::string> strings;
+            a8::Split(pickup3(), strings, '|');
+        }
     }
 
     std::set<int>* MergeItem::GetBuffs(int num)
     {
-        return nullptr;
+        auto itr = gun_num_buff_hash_.find(num);
+        return itr != gun_num_buff_hash_.end() ? &itr->second : nullptr;;
     }
 
 }