From c5cdc0a9549583a24f8eb8f27ccfcc6d590522cb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 26 Mar 2019 15:33:54 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc | 2 +-
 server/gameserver/player.cc | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 4ecba13..7dfb3d2 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -27,7 +27,7 @@ void Bullet::Initialize()
 void Bullet::Update(int delta_time)
 {
     movement->Update(delta_time);
-    pos = pos + dir;
+    pos = pos + dir * gun_meta->i->bullet_speed();
     std::vector<Entity*> objects;
     int detection_flags = 0;
     {
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index ab15954..5c285c1 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -177,7 +177,7 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
     }
     shot_start = msg.shot_start();
     shot_hold = msg.shot_hold();
-    if (shot_hold) {
+    if (!shot_hold) {
         series_shot_frames = 0;
     }
 }
@@ -225,6 +225,8 @@ void Player::MakeUpdateMsg()
         for (auto& obj_uniid : room->frame_data.deleted_objects) {
             update_msg->add_del_objids(obj_uniid);
         }
+        *update_msg->mutable_shots() = room->frame_data.shots;
+        *update_msg->mutable_bullets() = room->frame_data.bullets;
         for (auto& itr : new_objects) {
             itr->FillMFObjectFull(update_msg->add_full_objects());
             #if 0