Update

Properties/AssemblyInfo.cs

@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion( "1.1.9.2" )]
-[assembly: AssemblyFileVersion( "1.1.9.2" )]
+[assembly: AssemblyVersion( "1.1.9.3" )]
+[assembly: AssemblyFileVersion( "1.1.9.3" )]

src/Api/Unturned/UPlayer.cs

@@ -24,6 +24,7 @@
 using System.Linq;
 using Essentials.Api.Command;
 using Essentials.Api.Command.Source;
+using Essentials.Common;
 using Essentials.Core;
 using Rocket.API;
 using Rocket.Core;
@@ -354,23 +355,38 @@ public static UPlayer From( Player player )
 
         public static UPlayer From( string name )
         {
-            Player player;
-
-            if ( name == null || (player = PlayerTool.getPlayer( name.ToLower() )) == null )
-                return null;
-
-            foreach ( var connectedPlayer in EssCore.Instance.ConnectedPlayers )
+            var connectedPlayers = EssCore.Instance.ConnectedPlayers;
+            var lastPlayer = null as UPlayer;
+
+            /*
+                Equals -> StartWith -> Contains
+            */
+
+            foreach ( var player in connectedPlayers )
             {
-                if ( connectedPlayer.UnturnedPlayer == player )
+                var pCharName = player.CharacterName;
+                var pSteamName = player.SteamName;
+
+                if ( pCharName.EqualsIgnoreCase( name ) ||
+                     pSteamName.EqualsIgnoreCase( name )  )
                 {
-                    return connectedPlayer;
+                    return player;
+                }
+
+                if ( pCharName.ToLowerInvariant().StartsWith( name.ToLowerInvariant() ) ||
+                     pSteamName.ToLowerInvariant().StartsWith( name.ToLowerInvariant() ) )
+                {
+                    return player;
+                }
+
+                if ( pCharName.ContainsIgnoreCase( name ) ||
+                     pSteamName.ContainsIgnoreCase( name ) )
+                {
+                    lastPlayer = player;
                 }
             }
-
-            var ret = new UPlayer( Rocket.Unturned.Player.UnturnedPlayer.FromPlayer( player ) );
-            EssCore.Instance.ConnectedPlayers.Add( ret );
-
-            return ret;
+
+            return lastPlayer;
         }
 
         public static UPlayer From( CSteamID csteamId )

src/Core/EssCore.cs

@@ -60,9 +60,9 @@ public sealed class EssCore : RocketPlugin
                 - Improve event system to avoid duplicate events.
         */
 
-        internal const string                         PLUGIN_VERSION              = "1.1.9.2";
+        internal const string                         PLUGIN_VERSION              = "1.1.9.3";
         internal const string                         ROCKET_VERSION              = "4.9.4.0";
-        internal const string                         UNTURNED_VERSION            = "3.14.12.1";
+        internal const string                         UNTURNED_VERSION            = "3.14.12.2";
 
         internal static EssCore                       Instance                    { get; set; }