From 0074d8a0bf3b0488cccad1a2b5c167645c009a46 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 28 Aug 2019 21:39:08 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc | 2 +-
 server/gameserver/room.cc  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 815e30d..c4bcfda 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2325,7 +2325,7 @@ void Human::ProcLootSkin(Loot* entity, MetaData::Equip* item_meta)
                 int entity_uniid = room->CreateLoot(skin_tank.skin_id, pos, 1, 1);
                 Entity* loot_entity = room->GetEntityByUniId(entity_uniid);
                 if (loot_entity && loot_entity->entity_type == ET_Loot) {
-                    ((Loot*)loot_entity)->bullet_num = skin_tank.bullet_num;
+                    ((Loot*)loot_entity)->bullet_num = tank_weapon.ammo;
                     room->UpdateCarObject(skin_tank.tank_uniid, entity_uniid);
                 }
             }
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 3c7d8fc..e407d8a 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1404,6 +1404,13 @@ void Room::NotifyUiUpdate()
 
 void Room::UpdateCarObject(int old_uniid, int new_uniid)
 {
+    auto itr = car_hash_.find(old_uniid);
+    if (itr != car_hash_.end()) {
+        CarObject new_obj = itr->second;
+        new_obj.car_uniid = new_uniid;
+        car_hash_[new_uniid] = new_obj;
+        car_hash_.erase(old_uniid);
+    }
 }
 
 void Room::NotifyWxVoip()