diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc
index 4cc2a96..c9cb7a6 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -71,12 +71,12 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
             hum->weapons[GUN_SLOT0].weapon_idx = GUN_SLOT0;
             hum->weapons[GUN_SLOT0].weapon_id = msg.weapon().weapon_id();
             hum->weapons[GUN_SLOT0].weapon_lv = msg.weapon().weapon_lv();
+            hum->weapons[GUN_SLOT0].meta = weapon_meta;
             #if 1
-            hum->weapons[GUN_SLOT0].ammo = 0;
+            hum->weapons[GUN_SLOT0].ammo = hum->weapons[GUN_SLOT0].GetClipVolume();
             #else
             hum->weapons[GUN_SLOT0].ammo = FIGHTING_MODE_BULLET_NUM;
             #endif
-            hum->weapons[GUN_SLOT0].meta = weapon_meta;
             hum->weapons[GUN_SLOT0].Recalc();
             hum->curr_weapon = &hum->weapons[GUN_SLOT0];
         }