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
         (