From 7cd149d7a7238611e16dbc1a9b66275c3626e438 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 26 Oct 2022 14:03:08 +0800
Subject: [PATCH] 1

---
 server/gameserver/virtualbullet.cc | 16 ++++++++--------
 server/gameserver/virtualbullet.h  |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/gameserver/virtualbullet.cc b/server/gameserver/virtualbullet.cc
index eaab2ed8..e997ea76 100644
--- a/server/gameserver/virtualbullet.cc
+++ b/server/gameserver/virtualbullet.cc
@@ -8,32 +8,32 @@ float VirtualBullet::GetStrengthenWall()
 
 long long VirtualBullet::GetWeaponUniId()
 {
-    return 0;
+    return weapon_uniid;
 }
 
 MetaData::Skill* VirtualBullet::GetSkillMeta()
 {
-    return nullptr;
+    return skill_meta;
 }
 
 MetaData::Equip* VirtualBullet::GetGunMeta()
 {
-    return nullptr;
+    return gun_meta;
 }
 
 MetaData::Equip* VirtualBullet::GetBulletMeta()
 {
-    return nullptr;
+    return bullet_meta;
 }
 
 CreatureWeakPtr VirtualBullet::GetSender()
 {
-
+    return sender;
 }
 
 CreatureWeakPtr VirtualBullet::GetPassenger()
 {
-
+    return passenger;
 }
 
 bool VirtualBullet::IsBomb()
@@ -43,10 +43,10 @@ bool VirtualBullet::IsBomb()
 
 bool VirtualBullet::IsPreBattleBullet()
 {
-    return false;
+    return is_pre_battle_bullet;
 }
 
 Room* VirtualBullet::GetRoom()
 {
-    return nullptr;
+    return room;
 }
diff --git a/server/gameserver/virtualbullet.h b/server/gameserver/virtualbullet.h
index 120d2366..edd31850 100644
--- a/server/gameserver/virtualbullet.h
+++ b/server/gameserver/virtualbullet.h
@@ -14,6 +14,10 @@ class VirtualBullet : public IBullet
     MetaData::Skill* skill_meta = nullptr;
     MetaData::Equip* gun_meta = nullptr;
     MetaData::Equip* bullet_meta = nullptr;
+    CreatureWeakPtr sender;
+    CreatureWeakPtr passenger;
+    Room* room = nullptr;
+    bool is_pre_battle_bullet = false;
 
     virtual float GetStrengthenWall() override;
     virtual long long GetWeaponUniId() override;