Whisper.cs.patch

71,106d70
<         private ulong FindPlayersSingleId(string nameOrIdOrIp, IPlayer player)
<         {
<             var targets = FindPlayers(nameOrIdOrIp);
<             if (targets.Count > 1)
<             {
<                 player.Reply("MultiplePlayers", string.Join(", ", targets.Select(p => p.displayName).ToArray()));
<                 return 0;
<             }
<             ulong userId;
<             if (targets.Count <= 0)
<             {
<                 if (ulong.TryParse(nameOrIdOrIp, out userId)) return userId;
<                 player.Reply("PlayerNotFound");
<                 return 0;
<             }
<             else
<                 userId = targets.First().userID;
<             return userId;
<         }
<
<         private static HashSet<BasePlayer> FindPlayers(string nameOrIdOrIp)
<         {
<             var foundPlayers = new HashSet<BasePlayer>();
<             if (string.IsNullOrEmpty(nameOrIdOrIp)) return foundPlayers;
<             foreach (var activePlayer in BasePlayer.activePlayerList)
<             {
<                 if (activePlayer.UserIDString.Equals(nameOrIdOrIp))
<                     foundPlayers.Add(activePlayer);
<                 else if (!string.IsNullOrEmpty(activePlayer.displayName) && activePlayer.displayName.ToLower().IndexOf(nameOrIdOrIp) != -1)
<                     foundPlayers.Add(activePlayer);
<                 else if (activePlayer.net?.connection != null && activePlayer.net.connection.ipaddress.Equals(nameOrIdOrIp))
<                     foundPlayers.Add(activePlayer);
<             }
<             return foundPlayers;
<         }
<
142c106
<             string userId = args[0];
---
>             var userId = args[0];
145,151c109,110
<                 ulong playerID = FindPlayersSingleId(userId, player);
<                 if (playerID == 0)
<                 {
<                     player.Reply(Lang(Msg.NoPlayer, player.Id));
<                     return;
<                 }
<                 userId = playerID.ToString();
---
>                 player.Reply(Lang(Msg.NotId, player.Id));
>                 return;
154,158c113,116
<             string foundPlayerName = FindPlayers(userId).First().displayName;
<             if (foundPlayer == null || !foundPlayer.IsConnected)
<             {
<                 player.Reply(Lang(Msg.NoPlayer, player.Id));
<                 return;
---
>             if (foundPlayer == null || !foundPlayer.IsConnected)
>             {
>                 player.Reply(Lang(Msg.NoPlayer, player.Id));
>                 return;
162c120
<             foundPlayer.Reply(covalence.FormatText(Lang(Msg.Prefix, player.Id) + foundPlayerName + ": " + Lang(Msg.Message, player.Id, fullArgs)));
---
>             foundPlayer.Reply(covalence.FormatText(Lang(Msg.Prefix, player.Id) + Lang(Msg.Message, player.Id, fullArgs)));