From b120b4355a9d2f863744dc8eec479c39cefa0eb1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 16 Jul 2023 13:32:44 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.cc | 40 +++++++++++++++++------------------
 server/gameserver/netdata.cc  |  5 +++++
 server/gameserver/netdata.h   |  4 ++++
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 5cf1aebb..998a13fe 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -2678,27 +2678,27 @@ void Creature::OnLand()
         }
     }
     gun_grasp_->Init();
-    #ifdef DEBUG
-    room->xtimer.SetTimeoutWpEx
-        (
-         SERVER_FRAME_RATE,
-         [this] (int event, const a8::Args* args)
-         {
-             if (a8::TIMER_EXEC_EVENT == event) {
-                 if (IsPlayer()) {
-                     room->frame_event.AddPropChg
-                         (
-                          GetWeakPtrRef(),
-                          kPropShowHonor,
-                          0,
-                          0,
-                          true
-                          );
+    if (IsPlayer() && GetBattleContext()->GetHonor()) {
+        room->xtimer.SetTimeoutWpEx
+            (
+             SERVER_FRAME_RATE,
+             [this] (int event, const a8::Args* args)
+             {
+                 if (a8::TIMER_EXEC_EVENT == event) {
+                     if (IsPlayer()) {
+                         room->frame_event.AddPropChg
+                             (
+                              GetWeakPtrRef(),
+                              kPropShowHonor,
+                              0,
+                              0,
+                              true
+                              );
+                     }
                  }
-             }
-         },
-         &xtimer_attacher);
-    #endif
+             },
+             &xtimer_attacher);
+    }
 }
 
 void Creature::CheckBulletHitHoldShield(IBullet* bullet, bool& eat)
diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc
index cfd21b7e..b00cb9aa 100644
--- a/server/gameserver/netdata.cc
+++ b/server/gameserver/netdata.cc
@@ -1112,3 +1112,8 @@ int BattleDataContext::GetBattleTimes()
 {
     return battle_times_;
 }
+
+int BattleDataContext::GetHonor()
+{
+    return honor_;
+}
diff --git a/server/gameserver/netdata.h b/server/gameserver/netdata.h
index cf71a3be..94f10b7d 100644
--- a/server/gameserver/netdata.h
+++ b/server/gameserver/netdata.h
@@ -86,6 +86,8 @@ struct BattleDataContext
     int GetCurrentGetStar();
     int GetBattleTimes();
 
+    int GetHonor();
+
 private:
     void Clear();
     float GetTotalAtk(IBullet* bullet);
@@ -109,6 +111,8 @@ private:
 
     int rank_ = 0;
 
+    int honor_ = 0;
+
     int skin_id_ = 0;
     int level_ = 0;
     int hero_lv_ = 0;