From ad8bfe7df741a5bbf09d2af924f043f9ec362d7b Mon Sep 17 00:00:00 2001
From: xSprite <xSpriteHDx@googlemail.com>
Date: Tue, 25 Sep 2018 05:49:11 +0200
Subject: [PATCH] fix PlayerNotFound

---
 Server/Commands/Admin.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs
index 605b84be..4c34ff0a 100644
--- a/Server/Commands/Admin.cs
+++ b/Server/Commands/Admin.cs
@@ -9,11 +9,7 @@ using reallife_gamemode.Server.Util;
 
 /**
 * @overview Life of German Reallife - Admin Commands (Admin.cs)
-<<<<<<< HEAD
-* @author VegaZ, hydrant, balbo
-=======
-* @author VegaZ, hydrant, xSprite
->>>>>>> 5e0e0d82f2d05dda2954836a69347d4433839f85
+* @author VegaZ, hydrant, xSprite, balbo
 * @copyright (c) 2008 - 2018 Life of German
 */
 
@@ -636,7 +632,7 @@ namespace reallife_gamemode.Server.Commands
             Client target = ClientService.GetClientByName(targetname);
             if (target == null)
             {
-                ChatService.PlayerNotFound(target);
+                ChatService.PlayerNotFound(player);
                 return;
             }
             target.Freeze(true);
@@ -654,7 +650,7 @@ namespace reallife_gamemode.Server.Commands
             Client target = ClientService.GetClientByName(targetname);
             if (target == null)
             {
-                ChatService.PlayerNotFound(target);
+                ChatService.PlayerNotFound(player);
                 return;
             }
             target.Freeze(false);
@@ -672,7 +668,7 @@ namespace reallife_gamemode.Server.Commands
             Client target = ClientService.GetClientByName(targetname);
             if (target == null)
             {
-                ChatService.PlayerNotFound(target);
+                ChatService.PlayerNotFound(player);
                 return;
             }
             string targetPlayername = NAPI.Player.GetPlayerName(target);
@@ -815,7 +811,7 @@ namespace reallife_gamemode.Server.Commands
             Client target = ClientService.GetClientByName(targetname);
             if (target == null)
             {
-                ChatService.PlayerNotFound(target);
+                ChatService.PlayerNotFound(player);
                 return;
             }
             player.SendChatMessage("IP von " + NAPI.Player.GetPlayerName(target) + ": " + target.Address);