diff --git a/server/gameserver/compose.cc b/server/gameserver/compose.cc index 627cd766..0e33c58f 100644 --- a/server/gameserver/compose.cc +++ b/server/gameserver/compose.cc @@ -73,7 +73,7 @@ void Compose::TakeOnWeapon(Weapon* weapon) Clear(); auto merge_item_meta = mt::MergeItem::GetById(weapon->meta->id()); if (merge_item_meta) { - std::set* buffs = merge_item_meta->GetBuffs(num_ + 1); + std::set* buffs = merge_item_meta->GetBuffs((num_ + 1) / 3); if (buffs) { for (int buff_id : *buffs) { hold_buffs_.push_back(owner_->TryAddBuff(owner_, buff_id, nullptr)); diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 603a35ed..479a949d 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -540,6 +540,9 @@ void Creature::RemoveBuffByUniId(int buff_uniid) break; } } + if (buff_id == 401041) { + int i = 0; + } for (auto& tuple1 : removed_buffs) { const mt::Buff* buff_meta = std::get<0>(tuple1); Creature* caster = std::get<1>(tuple1);