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 strings; + a8::Split(pickup3(), strings, '|'); + } } std::set* MergeItem::GetBuffs(int num) { - return nullptr; + auto itr = gun_num_buff_hash_.find(num); + return itr != gun_num_buff_hash_.end() ? &itr->second : nullptr;; } }