..

RocketModPlugins · May 13, 2019 · 4cfbf53 · 4cfbf53
1 parent 0460bbc
commit 4cfbf53
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 10 deletions.
diff --git a/DatabaseManager.cs b/DatabaseManager.cs
@@ -452,8 +452,8 @@ public List<PlayerData> QueryByName(string playerName, QueryType queryType, out
                         break;
                 }
                 if (pagination)
-                    command.CommandText = "SELECT COUNT(*) AS count FROM (SELECT * FROM (SELECT a.SteamID 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 + " ORDER BY b.LastLoginLocal ASC) AS g GROUP BY g.SteamID) AS c;";
-                command.CommandText += "SELECT * FROM (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 b.LastLoginLocal ASC) AS g GROUP BY g.SteamID ORDER BY g.LastLoginGlobal DESC" + (pagination ? " LIMIT " + limitStart + ", " + limit + ";" : ";");
+                    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 ) AND ( a.steamname LIKE @name OR a.charname LIKE @name ) ORDER  BY a.lastloginglobal DESC LIMIT  0, 10; ";
                 reader = command.ExecuteReader();
                 if (pagination)
                 {

diff --git a/Libraries/MySql.Data.dll b/Libraries/MySql.Data.dll
diff --git a/Libraries/System.Data.dll b/Libraries/System.Data.dll
diff --git a/Libraries/System.Management.dll b/Libraries/System.Management.dll
diff --git a/Libraries/System.Transactions.dll b/Libraries/System.Transactions.dll
diff --git a/PlayerInfoLib.csproj b/PlayerInfoLib.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PlayerInfoLib</RootNamespace>
     <AssemblyName>PlayerInfoLib</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -73,6 +73,10 @@
       <HintPath>lib\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>lib\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommandDelInstance.cs" />
@@ -94,12 +98,6 @@
     <Content Include="lib\Rocket.Core.dll" />
     <Content Include="lib\Rocket.Unturned.dll" />
     <Content Include="lib\UnityEngine.dll" />
-    <Content Include="Libraries\I18N.dll" />
-    <Content Include="Libraries\I18N.West.dll" />
-    <Content Include="Libraries\MySql.Data.dll" />
-    <Content Include="Libraries\System.Data.dll" />
-    <Content Include="Libraries\System.Management.dll" />
-    <Content Include="Libraries\System.Transactions.dll" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Libraries\I18N.dll">
@@ -123,7 +121,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(ProjectDir)$(OutDir)$(TargetFileName)" "$(ProjectDir)..\Rocket_Ref\PInfoLib\$(TargetFileName)"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/lib/Assembly-CSharp-firstpass.dll b/lib/Assembly-CSharp-firstpass.dll
diff --git a/lib/Assembly-CSharp.dll b/lib/Assembly-CSharp.dll
diff --git a/lib/Rocket.API.dll b/lib/Rocket.API.dll
diff --git a/lib/Rocket.Core.dll b/lib/Rocket.Core.dll
diff --git a/lib/Rocket.Unturned.dll b/lib/Rocket.Unturned.dll
diff --git a/lib/UnityEngine.CoreModule.dll b/lib/UnityEngine.CoreModule.dll
diff --git a/lib/UnityEngine.dll b/lib/UnityEngine.dll