From e7f18da2eebb765207f258a7931bacb0a0398209 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 6 Mar 2023 15:38:22 +0800
Subject: [PATCH] 1

---
 server/gameserver/buff/select_target_with_self_pos.cc |  4 +++-
 server/gameserver/buff/select_target_with_self_pos.h  |  4 ++++
 server/gameserver/buff/sprint.cc                      | 10 ----------
 server/gameserver/player.cc                           |  6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/server/gameserver/buff/select_target_with_self_pos.cc b/server/gameserver/buff/select_target_with_self_pos.cc
index c1c2f943..75fe396c 100644
--- a/server/gameserver/buff/select_target_with_self_pos.cc
+++ b/server/gameserver/buff/select_target_with_self_pos.cc
@@ -8,12 +8,14 @@
 
 void SelectTargetWithSelfPosBuff::Activate()
 {
+    hold_param3_ = meta->GetBuffParam3(this);
+    hold_param4_ = meta->GetBuffParam4(this);
     std::vector<Creature*> targets;
     owner->TraverseCreatures
         (
          [this, &targets] (Creature* c, bool& stop)
          {
-             if (owner->GetPos().Distance2D2(c->GetPos()) < meta->_int_buff_param3) {
+             if (owner->GetPos().Distance2D2(c->GetPos()) < hold_param3_) {
                  switch (meta->_int_buff_param1) {
                  case kBST_All:
                      {
diff --git a/server/gameserver/buff/select_target_with_self_pos.h b/server/gameserver/buff/select_target_with_self_pos.h
index 47654466..8c0499d9 100644
--- a/server/gameserver/buff/select_target_with_self_pos.h
+++ b/server/gameserver/buff/select_target_with_self_pos.h
@@ -9,4 +9,8 @@ class SelectTargetWithSelfPosBuff : public Buff
     virtual void Activate() override;
     virtual void Deactivate() override;
 
+ private:
+
+    float hold_param3_ = 0.0f;
+    float hold_param4_ = 0.0f;
 };
diff --git a/server/gameserver/buff/sprint.cc b/server/gameserver/buff/sprint.cc
index dd116fdb..09ff4170 100644
--- a/server/gameserver/buff/sprint.cc
+++ b/server/gameserver/buff/sprint.cc
@@ -17,11 +17,6 @@
 
 void SprintBuff::Activate()
 {
-    #if 0
-    if (meta->_int_buff_param5) {
-        owner->IncDisableMoveDirTimes();
-    }
-    #endif
     move_distance_limit_ = meta->GetBuffParam2(this);
     check_interval_time_ = meta->GetBuffParam5(this);
     check_distance_ = meta->GetBuffParam4(this);
@@ -31,11 +26,6 @@ void SprintBuff::Activate()
 
 void SprintBuff::Deactivate()
 {
-    #if 0
-    if (meta->_int_buff_param5) {
-        owner->DecDisableMoveDirTimes();
-    }
-    #endif
 }
 
 void SprintBuff::SprintMove()
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index f5d60da7..caa11961 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1673,9 +1673,10 @@ void Player::UpdateThrowBomb()
                                                throw_bomb->dir().y(),
                                                throw_bomb->dir().z()
                                                );
+                int throw_uniid = room->AllocUniid();
                 room->frame_event.AddBullet
                     (
-                     room->AllocUniid(),
+                     throw_uniid,
                      GetWeakPtrRef(),
                      equip_meta,
                      1,
@@ -1685,8 +1686,7 @@ void Player::UpdateThrowBomb()
                      0,
                      1
                      );
-                pending_throw_bomb[throw_bomb->throw_uniid()] = throw_bomb;
-                int throw_uniid = throw_bomb->throw_uniid();
+                pending_throw_bomb[throw_uniid] = throw_bomb;
                 room->xtimer.SetTimeoutEx
                     (
                      SERVER_FRAME_RATE * 15,