From 84b2c4bf08825c318f3dbe92866547aab0d3ac5d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 5 Jul 2021 10:41:49 +0000
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc             | 3 +++
 server/gameserver/creature.cc           | 9 +++++----
 server/tools/protobuild/metatable.proto | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 5024017..b629eda 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -242,6 +242,9 @@ void Bullet::ProcSmokeBomb()
 
 bool Bullet::IsBomb()
 {
+    if (!meta) {
+        return false;
+    }
     return
         meta->i->_inventory_slot() == IS_RPG ||
         meta->i->_inventory_slot() == IS_FRAG ||
diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 0db23d0..42738c1 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -253,11 +253,12 @@ void Creature::AddBuff(Creature* caster,
         }
     }
 #ifdef DEBUG
-    SendDebugMsg(a8::Format("添加buff_id:%d buff_effect:%d",
+    SendDebugMsg(a8::Format("添加buff_id:%d buff_effect:%d name:%s",
                             {
-                                buff_meta->i->buff_id(),
-                                    buff_meta->i->buff_effect()
-                                    }));
+                             buff_meta->i->buff_id(),
+                             buff_meta->i->buff_effect(),
+                             buff_meta->i->name(),
+                            }));
 #endif
 }
 
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index 893bda3..aff2154 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -232,6 +232,7 @@ message Skill
 message Buff
 {
     required int32 buff_id = 1;
+    required string name = 20;
     required int32 buff_target = 2;
     required int32 buff_effect = 3;
     required int32 trigger_type = 4;