Add files via upload

Author: zeng-github01

DatabaseManager.cs

@@ -455,13 +455,16 @@ public List<PlayerData> QueryByName(string playerName, QueryType queryType, out
                     case QueryType.IP:
                         type = "AND a.IP = " + Parser.getUInt32FromIP(playerName);
                         break;
+                    case QueryType.HWID:
+                        type = "AND a.HWID LIKE @name";
+                        break;
                     default:
                         type = string.Empty;
                         break;
                 }
                 if (pagination)
                     command.CommandText = "SELECT IFNULL(Count(a.steamid),0) AS count FROM  `" + Table + "` AS a LEFT JOIN `" + TableServer + "` AS b ON a.steamid = b.steamid  WHERE  ( b.serverid = @instance OR b.serverid = a.lastserverid OR b.serverid IS NULL )  " + type + " GROUP BY a.steamid;";
-                command.CommandText += "SELECT a.steamid, a.steamname, a.charname, a.ip, a.lastloginglobal, a.totalplaytime, a.lastserverid, b.serverid, b.lastloginlocal, b.cleanedbuildables, b.cleanedplayerdata, c.servername AS LastServerName FROM `" + Table + "` AS a LEFT JOIN `" + TableServer + "` AS b ON a.steamid = b.steamid LEFT JOIN `" + TableInstance + "` AS c ON a.lastserverid = c.serverid WHERE (b.serverid = @instance OR b.serverid = a.lastserverid OR b.serverid IS NULL ) " + type + " ORDER BY a.lastloginglobal DESC LIMIT  0, 10; ";
+                command.CommandText += "SELECT a.steamid, a.steamname, a.charname, a.ip, a.hwid, a.lastloginglobal, a.totalplaytime, a.lastserverid, b.serverid, b.lastloginlocal, b.cleanedbuildables, b.cleanedplayerdata, c.servername AS LastServerName FROM `" + Table + "` AS a LEFT JOIN `" + TableServer + "` AS b ON a.steamid = b.steamid LEFT JOIN `" + TableInstance + "` AS c ON a.lastserverid = c.serverid WHERE (b.serverid = @instance OR b.serverid = a.lastserverid OR b.serverid IS NULL ) " + type + " ORDER BY a.lastloginglobal DESC LIMIT  0, 10; ";
                 reader = command.ExecuteReader();
                 if (pagination)
                 {
@@ -805,6 +808,7 @@ public enum QueryType
         CharName,
         Both,
         IP,
+        HWID,
     }
 
     public enum OptionType

Extensions.cs

@@ -30,13 +30,17 @@ public static string GetIP(this CSteamID cSteamID)
             //P2PSessionState_t sessionState;
             //SteamGameServerNetworking.GetP2PSessionState(cSteamID, out sessionState);
             //return Parser.getIPFromUInt32(sessionState.m_nRemoteIP);
-            var Ip = UnturnedPlayer.FromCSteamID(cSteamID).Player.channel.owner.getIPv4AddressOrZero();
-            return Parser.getIPFromUInt32(Ip);
+            //SteamGameServerNetworking.GetP2PSessionState(cSteamID, out P2PSessionState_t p2PSessionState_T);
+            var player = UnturnedPlayer.FromCSteamID(cSteamID);
+            var IP = player.Player.channel.owner.getIPv4AddressOrZero();
+            return Parser.getIPFromUInt32(IP);
         }
         public static string GetHWID(this CSteamID cSteamID)
         {
-            var hwid = UnturnedPlayer.FromCSteamID(cSteamID).Player.channel.owner.playerID.hwid;
-            return string.Join("", hwid);
+            var player = UnturnedPlayer.FromCSteamID(cSteamID);
+            var hwid = player.Player.channel.owner.playerID.GetHwids().GetEnumerator();
+            hwid.MoveNext();
+            return string.Join("", hwid.Current);
         }
 
         // Returns a Steamworks.CSteamID on out from a string, and returns true if it is a CSteamID.