diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index ff2fff68..8e013417 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -624,7 +624,7 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: } } for (auto& spec_weapon : spec_weapons) { - MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquip(second_weapon.weapon_id); + MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquip(spec_weapon.weapon_id); if (item_meta) { if (item_meta->i->equip_subtype() != 1) { int weapon_idx = GUN_SLOT1; @@ -635,9 +635,9 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: Weapon* weapon = &weapons[weapon_idx]; weapon->weapon_uniid = spec_weapon.weapon_uniid; weapon->weapon_idx = weapon_idx; - weapon->weapon_id = second_weapon.weapon_id; - weapon->weapon_lv = second_weapon.weapon_lv; - weapon->ammo = second_weapon.ammo; + weapon->weapon_id = spec_weapon.weapon_id; + weapon->weapon_lv = spec_weapon.weapon_lv; + weapon->ammo = spec_weapon.ammo; weapon->meta = item_meta; weapon->Recalc(); SetCurrWeapon(&weapons[GUN_SLOT1]);