cs2/cs2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-09-27 20:17:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse source 
upstream 1.7.2b
This commit is contained in:
Sachin 2025-01-16 23:33:42 +05:30
commit a7cad842d3
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CS2-SimpleAdmin/CS2-SimpleAdmin.cs
View file

@ -11,7 +11,7 @@ using MySqlConnector;
namespace CS2_SimpleAdmin;
[MinimumApiVersion(286)]
[MinimumApiVersion(300)]
public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig>
{
internal static CS2_SimpleAdmin Instance { get; private set; } = new();
@ -19,7 +19,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
public override string ModuleAuthor => "daffyy & Dliix66";
public override string ModuleVersion => "1.7.2a";
public override string ModuleVersion => "1.7.2b";
public override void Load(bool hotReload)
{
@ -58,8 +58,6 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override void OnAllPluginsLoaded(bool hotReload)
{
new ServerManager().CheckHibernationStatus();
AddTimer(3.0f, () => ReloadAdmins(null));
try

2
CS2-SimpleAdmin/CS2-SimpleAdmin.csproj
View file

@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.287" />
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.300" />
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="MySqlConnector" Version="2.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="*" />

2
CS2-SimpleAdmin/Events.cs
View file

@ -396,6 +396,8 @@ value.WaitingForKick)
if (Config.OtherSettings.ReloadAdminsEveryMapChange && ServerLoaded && ServerId != null)
AddTimer(3.0f, () => ReloadAdmins(null));
AddTimer(1.0f, () => new ServerManager().CheckHibernationStatus());
// AddTimer(34, () =>
// {
// if (!ServerLoaded)

24
CS2-SimpleAdmin/Helper.cs
View file

@ -171,8 +171,8 @@ internal static class Helper
if (player == null || !player.IsValid || player.IsHLTV)
return;
if (player.UserId.HasValue)
CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true;
if (player.UserId.HasValue && CS2_SimpleAdmin.PlayersInfo.TryGetValue(player.UserId.Value, out var value))
value.WaitingForKick = true;
player.CommitSuicide(true, true);
@ -183,16 +183,16 @@ internal static class Helper
if (!player.IsValid || player.IsHLTV)
return;
Server.ExecuteCommand($"kickid {player.UserId}");
// Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); Broken after last update
player.Disconnect(reason);
});
}
else
{
Server.ExecuteCommand($"kickid {player.UserId}");
// Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); // Broken after last update
player.Disconnect(reason);
}
if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)
@ -216,8 +216,8 @@ internal static class Helper
if (!player.IsValid || player.IsHLTV)
return;
if (player.UserId.HasValue)
CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true;
if (player.UserId.HasValue && CS2_SimpleAdmin.PlayersInfo.TryGetValue(player.UserId.Value, out var value))
value.WaitingForKick = true;
player.CommitSuicide(true, true);
@ -238,15 +238,15 @@ internal static class Helper
// }
// }
//
Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); // Broken after last update
// Server.ExecuteCommand($"kickid {player.UserId}");
player.Disconnect(reason);
});
}
else
{
Server.ExecuteCommand($"kickid {player.UserId}");
// Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); // Broken after last update
player.Disconnect(reason);
}
if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)

2
CS2-SimpleAdmin/VERSION
View file

@ -1 +1 @@
1.7.2a
1.7.2b

2
CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj
View file

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.287" />
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.300" />
</ItemGroup>
</Project>