From a428f6ebc521ee063cc2274f7462df526c06d4bf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 25 May 2020 10:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4Human=E9=87=8C=E7=9A=84timer?=
 =?UTF-8?q?=5Fattacher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/human.cc    | 2 +-
 server/gameserver/human.h     | 1 -
 server/gameserver/metadata.cc | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index e9d38a1..0dfac3d 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2892,7 +2892,7 @@ void Human::AddItem(int item_id, int item_num)
         items_[item_id] = item_num;
     }
 
-    if (room->frame_no > join_frameno) {
+    if (room && room->frame_no > join_frameno) {
         room->frame_event.AddItemChg(this, item_id, items_[item_id]);
     } else {
         if (item_num <= 0) {
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 0f2e62c..e390922 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -46,7 +46,6 @@ class Human : public MoveableEntity
     MetaData::Dress* skin_jlf_meta = nullptr;
     MetaData::Equip* skin_tank_meta = nullptr;
     HumanAbility ability;
-    a8::XTimerAttacher xtimer_attacher;
 
     a8::Vec2 move_dir;
     a8::Vec2 attack_dir;
diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc
index b9e99b2..82b8d59 100644
--- a/server/gameserver/metadata.cc
+++ b/server/gameserver/metadata.cc
@@ -491,7 +491,7 @@ namespace MetaData
     {
         std::vector<std::string> strings;
         a8::Split(i->drop(), strings, ':');
-        if (strings.size() < 2) {
+        if (strings.size() >= 2) {
             drop.push_back(std::make_tuple(
                                            a8::XValue(strings[0]),
                                            a8::XValue(strings[1])