GarpBot/CS2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-03-07 07:31:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.2.8c

Browse Source 
- Updated CounterStrikeSharp to 159
- Minor changes
This commit is contained in:
Dawid Bepierszcz
2024-01-26 13:45:16 +01:00
parent e584316a28
commit 67ad1851bf
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CS2-SimpleAdmin.cs
View File

@@ -18,7 +18,7 @@ using System.Text;
namespace CS2_SimpleAdmin; namespace CS2_SimpleAdmin;
[MinimumApiVersion(154)] [MinimumApiVersion(159)]
public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig> public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig>
{ {
public static IStringLocalizer? _localizer; public static IStringLocalizer? _localizer;
@@ -36,7 +36,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override string ModuleName => "CS2-SimpleAdmin"; public override string ModuleName => "CS2-SimpleAdmin";
public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)"; public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
public override string ModuleAuthor => "daffyy"; public override string ModuleAuthor => "daffyy";
public override string ModuleVersion => "1.2.8b"; public override string ModuleVersion => "1.2.8c";
public CS2_SimpleAdminConfig Config { get; set; } = new(); public CS2_SimpleAdminConfig Config { get; set; } = new();
@@ -510,7 +510,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_mute {player!.UserId}"); NativeAPI.IssueServerCommand($"css_tag_mute {player!.UserId}");
if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId)) if (player != null && player.UserId != null && !gaggedPlayers.Contains((ushort)player.UserId))
gaggedPlayers.Add((ushort)player.UserId); gaggedPlayers.Add((ushort)player.UserId);
if (time > 0 && time <= 30) if (time > 0 && time <= 30)
@@ -1689,10 +1689,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
voteAnswers.Clear(); voteAnswers.Clear();
voteInProgress = false; voteInProgress = false;
}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE); }, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
return;
} }
[ConsoleCommand("css_changemap")]
[ConsoleCommand("css_map")] [ConsoleCommand("css_map")]
[RequiresPermissions("@css/changemap")] [RequiresPermissions("@css/changemap")]
[CommandHelper(minArgs: 1, usage: "<mapname>", whoCanExecute: CommandUsage.CLIENT_AND_SERVER)] [CommandHelper(minArgs: 1, usage: "<mapname>", whoCanExecute: CommandUsage.CLIENT_AND_SERVER)]
@@ -1706,19 +1705,20 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
return; return;
} }
AddTimer(5f, () =>
{
Server.ExecuteCommand($"changelevel {map}");
});
if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_changemap_message", caller == null ? "Console" : caller.PlayerName, map]); sb.Append(_localizer["sa_admin_changemap_message", caller == null ? "Console" : caller.PlayerName, map]);
Server.PrintToChatAll(sb.ToString()); Server.PrintToChatAll(sb.ToString());
} }
AddTimer(3.0f, () =>
{
Server.ExecuteCommand($"changelevel {map}");
}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
} }
[ConsoleCommand("css_changewsmap", "Change workshop map.")]
[ConsoleCommand("css_wsmap", "Change workshop map.")] [ConsoleCommand("css_wsmap", "Change workshop map.")]
[ConsoleCommand("css_workshop", "Change workshop map.")] [ConsoleCommand("css_workshop", "Change workshop map.")]
[CommandHelper(1, "<name or id>")] [CommandHelper(1, "<name or id>")]
@@ -1728,7 +1728,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
string? _command = null; string? _command = null;
var map = command.GetArg(1); var map = command.GetArg(1);
_command = ulong.TryParse(map, out var mapId) ? $"host_workshop_map {mapId}" : $"ds_workshop_changelevel {map}"; _command = int.TryParse(map, out var mapId) ? $"host_workshop_map {mapId}" : $"ds_workshop_changelevel {map}";
if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
@@ -1736,10 +1736,10 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
Server.PrintToChatAll(sb.ToString()); Server.PrintToChatAll(sb.ToString());
} }
AddTimer(5f, () => AddTimer(3.0f, () =>
{ {
Server.ExecuteCommand(_command); Server.ExecuteCommand(_command);
}); }, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
} }
[ConsoleCommand("css_asay", "Say to all admins.")] [ConsoleCommand("css_asay", "Say to all admins.")]

2
CS2-SimpleAdmin.csproj
View File

@@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.154" /> <PackageReference Include="CounterStrikeSharp.API" Version="1.0.159" />
<PackageReference Include="Dapper" Version="*" /> <PackageReference Include="Dapper" Version="*" />
<PackageReference Include="MySqlConnector" Version="2.3.5" /> <PackageReference Include="MySqlConnector" Version="2.3.5" />
</ItemGroup> </ItemGroup>

4
Events.cs
View File

@@ -25,7 +25,7 @@ public partial class CS2_SimpleAdmin
RegisterEventHandler<EventRoundStart>(OnRoundStart); RegisterEventHandler<EventRoundStart>(OnRoundStart);
AddCommandListener("say", OnCommandSay); AddCommandListener("say", OnCommandSay);
AddCommandListener("say_team", OnCommandTeamSay); AddCommandListener("say_team", OnCommandTeamSay);
AddCommandListener("callvote", OnCommandCallVote); //AddCommandListener("callvote", OnCommandCallVote);
} }
/*private HookResult OnPlayerFullConnect(EventPlayerConnectFull @event, GameEventInfo info) /*private HookResult OnPlayerFullConnect(EventPlayerConnectFull @event, GameEventInfo info)
@@ -202,7 +202,7 @@ public partial class CS2_SimpleAdmin
if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (int)player.UserId) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }