From b915ae99bbaa2253c61ab8a6e048619a1b26b3da Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 9 Sep 2021 15:41:30 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc             | 1 -
 server/gameserver/player.cc            | 1 +
 server/tools/protobuild/cs_proto.proto | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 37097a5..89abfa0 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2448,7 +2448,6 @@ void Human::NotifyObservers(cs::SMUpdate* msg, cs::MFActivePlayerData* active_pl
         if (observer != this && !observer->follow_synced_active_player) {
             msg->set_active_player_id(GetUniId());
             FillMFActivePlayerData(msg->mutable_active_player_data());
-            msg->mutable_active_player_data()->set_name(GetName());
             if (!refreshed_view) {
                 std::set<int> synced_objects;
                 {
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index ece8e4b..5da00dc 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1310,6 +1310,7 @@ void Player::AsyncRequestWatchWar(bool send_rsp_msg)
             cs::SMWatchWar respmsg;
             Human* target = hum->room->GetWatchWarTarget(hum);
             if (target) {
+                respmsg.set_name(target->GetName());
                 hum->SendNotifyMsg(respmsg);
                 hum->FollowTarget(target);
                 target->StartRefreshViewTimer();
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 55fbf82..b89357e 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -1071,6 +1071,7 @@ message SMWatchWar
 {
     optional int32 error_code = 1 [default = 0]; //错误码 0:成功 1:失败
     optional string error_msg = 2; //错误信息
+    optional string name = 3; //昵称
 }
 
 //加入成功