From 9a3d356888fbcda2fa88dc7c027419f37dc3a50f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 26 Aug 2021 16:31:44 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 6e2b3bb4..1a6c61df 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1398,17 +1398,17 @@ void Player::_CMWatchWar(f8::MsgHdr& hdr, const cs::CMWatchWar& msg) } auto cb = [] (const a8::XParams& param) { - #if 0 + Player* hum = (Player*)param.sender.GetUserData(); + cs::SMWatchWar respmsg; - Human* target = room->GetWatchWarTarget(this); + Human* target = hum->room->GetWatchWarTarget(hum); if (target) { - SendNotifyMsg(respmsg); - hdr.hum->FollowTarget(target); + hum->SendNotifyMsg(respmsg); + hum->FollowTarget(target); } else { respmsg.set_error_code(1); - SendNotifyMsg(respmsg); + hum->SendNotifyMsg(respmsg); } - #endif }; watch_war_req_timer_ = room->xtimer.AddDeadLineTimerAndAttach (