Skip to content

Commit 4cfbf53

Browse files
committed
..
1 parent 0460bbc commit 4cfbf53

13 files changed

+9
-10
lines changed

DatabaseManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ public List<PlayerData> QueryByName(string playerName, QueryType queryType, out
452452
break;
453453
}
454454
if (pagination)
455-
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;";
456-
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 + ";" : ";");
455+
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";
456+
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; ";
457457
reader = command.ExecuteReader();
458458
if (pagination)
459459
{

Libraries/MySql.Data.dll

-20 KB
Binary file not shown.

Libraries/System.Data.dll

104 KB
Binary file not shown.

Libraries/System.Management.dll

-4.5 KB
Binary file not shown.

Libraries/System.Transactions.dll

-7.5 KB
Binary file not shown.

PlayerInfoLib.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>PlayerInfoLib</RootNamespace>
1111
<AssemblyName>PlayerInfoLib</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -73,6 +73,10 @@
7373
<HintPath>lib\UnityEngine.dll</HintPath>
7474
<Private>False</Private>
7575
</Reference>
76+
<Reference Include="UnityEngine.CoreModule">
77+
<HintPath>lib\UnityEngine.CoreModule.dll</HintPath>
78+
<Private>False</Private>
79+
</Reference>
7680
</ItemGroup>
7781
<ItemGroup>
7882
<Compile Include="CommandDelInstance.cs" />
@@ -94,12 +98,6 @@
9498
<Content Include="lib\Rocket.Core.dll" />
9599
<Content Include="lib\Rocket.Unturned.dll" />
96100
<Content Include="lib\UnityEngine.dll" />
97-
<Content Include="Libraries\I18N.dll" />
98-
<Content Include="Libraries\I18N.West.dll" />
99-
<Content Include="Libraries\MySql.Data.dll" />
100-
<Content Include="Libraries\System.Data.dll" />
101-
<Content Include="Libraries\System.Management.dll" />
102-
<Content Include="Libraries\System.Transactions.dll" />
103101
</ItemGroup>
104102
<ItemGroup>
105103
<Content Include="Libraries\I18N.dll">
@@ -123,7 +121,8 @@
123121
</ItemGroup>
124122
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
125123
<PropertyGroup>
126-
<PostBuildEvent>copy "$(ProjectDir)$(OutDir)$(TargetFileName)" "$(ProjectDir)..\Rocket_Ref\PInfoLib\$(TargetFileName)"</PostBuildEvent>
124+
<PostBuildEvent>
125+
</PostBuildEvent>
127126
</PropertyGroup>
128127
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
129128
Other similar extension points exist, see Microsoft.Common.targets.

lib/Assembly-CSharp-firstpass.dll

6.82 KB
Binary file not shown.

lib/Assembly-CSharp.dll

136 KB
Binary file not shown.

lib/Rocket.API.dll

1 KB
Binary file not shown.

lib/Rocket.Core.dll

-512 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)