From 98381f5aadaaf172cd4781d912933f071e37a78e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 18 Jun 2019 16:13:38 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 2 +- server/gameserver/playermgr.cc | 1 - server/gameserver/roommgr.cc | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 9547cb3..24e3ea9 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -718,7 +718,7 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: curr_weapon = &weapons[GUN_SLOT2]; } } - if (!weapon) { + if (weapon) { weapon->weapon_id = equip_id; weapon->weapon_lv = std::max(1, GetWeaponConfigLv(weapon->weapon_id)); weapon->ammo = 0; diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index caaee89..bd87ce6 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -65,7 +65,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ hum->skin.skin_lv = std::max(1, hum->GetSkinConfigLv(hum->skin.skin_id)); } #endif - hum->ProcPrepareItems(msg.prepare_items()); socket_hash_[socket] = hum; return hum; } diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 63d3083..7440a59 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -87,6 +87,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg); hum->meta = hum_meta; room->AddPlayer(hum); + hum->ProcPrepareItems(msg.prepare_items()); cs::SMJoinedNotify notifymsg; notifymsg.set_error_code(0); @@ -118,6 +119,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg); hum->meta = hum_meta; room->AddPlayer(hum); + hum->ProcPrepareItems(msg.prepare_items()); { cs::SMJoinedNotify notifymsg;