From a9c206ed2906357f51d0da6ff59b937573db7554 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 31 Jul 2024 16:19:32 +0800
Subject: [PATCH] 1

---
 server/gameserver/boxdrop.cc  | 5 ++++-
 server/gameserver/commands.cc | 1 +
 server/gameserver/team.cc     | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/boxdrop.cc b/server/gameserver/boxdrop.cc
index c8261a8b..559612ae 100644
--- a/server/gameserver/boxdrop.cc
+++ b/server/gameserver/boxdrop.cc
@@ -70,11 +70,14 @@ void BoxDrop::OnBattleStart()
              {
                  if (a8::TIMER_EXEC_EVENT == event) {
                      if (!room_->IsGameOver() && !room_->GetVictoryTeam()) {
-                         RequestAllocBoxNum();
+                         if (!alloced_) {
+                             RequestAllocBoxNum();
+                         }
                      }
                  }
              },
              &room_->xtimer_attacher_);
+        RequestAllocBoxNum();
     }
 }
 
diff --git a/server/gameserver/commands.cc b/server/gameserver/commands.cc
index a30e6701..9af7dbad 100644
--- a/server/gameserver/commands.cc
+++ b/server/gameserver/commands.cc
@@ -74,6 +74,7 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg)
         glm::vec3 pos;
         if (room->GetBoxDrop()->GetNextBoxPos(pos)) {
             GetMutablePos().FromGlmVec3(pos);
+            GetMovement()->ClearPath();
             room->grid_service->MoveCreature(this);
         }
     } else if (cmd == "additem" && cmds.size() >= 3) {
diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc
index 49357ab8..993e5ee0 100644
--- a/server/gameserver/team.cc
+++ b/server/gameserver/team.cc
@@ -405,6 +405,7 @@ void Team::GenBattleReportData(a8::MutableXObject* params)
             member_pb->SetVal("max_hero_skill_lv", hum->stats->max_hero_skill_lv);
             member_pb->SetVal("abandon_battle", hum->stats->abandon_battle);
             member_pb->SetVal("assist", hum->stats->assist);
+            member_pb->SetVal("box_num", hum->box_num);
             {
                 std::string weapons_type;
                 std::string weapons_slot;