From c25bb87fc1de3aca3b58a0de0dc0b0b2bcdcd9ba Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 1 Aug 2019 17:19:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/framemaker.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index d68f103..8912157 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -99,12 +99,12 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
         for (size_t idx : hum->chged_inventorys_) {
             if (idx < room->frame_event.chged_inventorys_.size()) {
                 Human* target = room->frame_event.chged_inventorys_[idx];
-                {
+                if (target->curr_weapon) {
                     auto p = msg->add_chged_property_list();
                     p->set_obj_id(target->entity_uniid);
                     p->set_property_type(kPropInventory);
                     p->set_property_subtype(kWEAPON_SLOT);
-                    p->set_value(target->GetInventory(kWEAPON_SLOT));
+                    p->set_value(target->curr_weapon->ammo);
                 }
             }
         }