From ce7c8403bf0d33d2d198a197339c42b1527f627b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 11 Jan 2024 16:26:22 +0800
Subject: [PATCH] 1

---
 server/gameserver/movement.cc | 2 +-
 server/gameserver/room.cc     | 7 -------
 server/gameserver/team.cc     | 1 +
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/server/gameserver/movement.cc b/server/gameserver/movement.cc
index 869856e7..bfed438b 100644
--- a/server/gameserver/movement.cc
+++ b/server/gameserver/movement.cc
@@ -30,7 +30,7 @@ bool Movement::UpdatePosition()
         curr_point.curr_pos.AddGlmVec3(curr_point.dir * owner_->GetSpeed());
         owner_->SetPos(curr_point.curr_pos);
         owner_->room->map_instance->CheckTerrain(owner_, curr_point.same_polys_flags, curr_point.spec_polys);
-        if (owner_->IsHuman()) {
+        if (owner_->IsHuman() && owner_->room->BattleStarted()) {
             owner_->AsHuman()->stats->IncMoveDistance(owner_->GetSpeed());
         }
     }
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 5424b11c..a4799c8a 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2889,13 +2889,6 @@ void Room::AddToPostBattleAutoFreeList(a8::XTimerWp timer)
     if (timer.expired()) {
         A8_ABORT();
     }
-    // 999
-    #if 1
-    #else
-    if (post_battle_auto_free_list_.find(timer) != post_battle_auto_free_list_.end()) {
-        A8_ABORT();
-    }
-    #endif
     post_battle_auto_free_list_.push_back(timer);
 }
 
diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc
index 8b3a8fd4..9946a69d 100644
--- a/server/gameserver/team.cc
+++ b/server/gameserver/team.cc
@@ -365,6 +365,7 @@ void Team::GenBattleReportData(Human* player, a8::MutableXObject* params)
             } else {
                 member_pb->SetVal("skin_id", 0);
             }
+            member_pb->SetVal("move_distance", hum->stats->move_distance);
 
             member_pb->SetVal("hero_id", hum->meta->id());
             member_pb->SetVal("hero_uniid", hum->hero_uniid);