Compare commits

..

5 Commits

Author SHA1 Message Date
Yuriy Petleshkov
cc1fbb88d6 Merge 84646e4451 into 8c94a867d3 2024-11-27 22:05:14 +08:00
Dawid Bepierszcz
8c94a867d3 Merge branch 'main' of https://github.com/daffyyyy/CS2-SimpleAdmin 2024-11-26 23:37:52 +01:00
Dawid Bepierszcz
023e1a031b 1.6.9c
- Added config variable to enable/disable checking for banned multiaccounts by ip `CheckMultiAccountsByIp`
- Fixed css_speed after player hurt
- Finally fixed vote kick (callvote)
- Small fix for admins loading from database
2024-11-26 23:37:49 +01:00
Dawid Bepierszcz
1f1c214357 Merge pull request #183 from 1370533448/patch-1
Update zh-Hans.json
2024-11-26 13:09:00 +01:00
Ktm
5668c0ad7b Update zh-Hans.json
Incorrect translation of time and reason leads to incorrect display
2024-11-17 03:41:30 +08:00
13 changed files with 172 additions and 109 deletions

View File

@@ -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 ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
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 & Dliix66"; public override string ModuleAuthor => "daffyy & Dliix66";
public override string ModuleVersion => "1.6.9a"; public override string ModuleVersion => "1.6.9c";
public override void Load(bool hotReload) public override void Load(bool hotReload)
{ {

View File

@@ -378,11 +378,11 @@ public partial class CS2_SimpleAdmin
await Server.NextWorldUpdateAsync(() => await Server.NextWorldUpdateAsync(() =>
{ {
if (!string.IsNullOrEmpty(adminsFile)) if (!string.IsNullOrEmpty(adminsFile))
AddTimer(1.0f, () => AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json")); AddTimer(0.5f, () => AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json"));
if (!string.IsNullOrEmpty(groupsFile)) if (!string.IsNullOrEmpty(groupsFile))
AddTimer(1.5f, () => AdminManager.LoadAdminGroups(ModuleDirectory + "/data/groups.json")); AddTimer(0.8f, () => AdminManager.LoadAdminGroups(ModuleDirectory + "/data/groups.json"));
if (!string.IsNullOrEmpty(adminsFile)) if (!string.IsNullOrEmpty(adminsFile))
AddTimer(2.0f, () => AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json")); AddTimer(1.1f, () => AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json"));
}); });
}); });

View File

@@ -225,13 +225,16 @@ public class OtherSettings
[JsonPropertyName("UserMessageGagChatType")] [JsonPropertyName("UserMessageGagChatType")]
public bool UserMessageGagChatType { get; set; } = false; public bool UserMessageGagChatType { get; set; } = false;
[JsonPropertyName("CheckMultiAccountsByIp")]
public bool CheckMultiAccountsByIp { get; set; } = true;
[JsonPropertyName("AdditionalCommandsToLog")] [JsonPropertyName("AdditionalCommandsToLog")]
public List<string> AdditionalCommandsToLog = new(); public List<string> AdditionalCommandsToLog { get; set; } = new();
} }
public class CS2_SimpleAdminConfig : BasePluginConfig public class CS2_SimpleAdminConfig : BasePluginConfig
{ {
[JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 23; [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 24;
[JsonPropertyName("DatabaseHost")] [JsonPropertyName("DatabaseHost")]
public string DatabaseHost { get; set; } = ""; public string DatabaseHost { get; set; } = "";

View File

@@ -147,7 +147,7 @@ public partial class CS2_SimpleAdmin
foreach (var player in PlayersInfo.Values) foreach (var player in PlayersInfo.Values)
{ {
player.DiePosition = null; player.DiePosition = default;
} }
AddTimer(0.41f, () => AddTimer(0.41f, () =>
@@ -215,8 +215,6 @@ public partial class CS2_SimpleAdmin
if (target == null || !target.IsValid || target.Connected != PlayerConnectedState.PlayerConnected) if (target == null || !target.IsValid || target.Connected != PlayerConnectedState.PlayerConnected)
return HookResult.Continue; return HookResult.Continue;
Logger.LogInformation($"{player.PlayerName} {AdminManager.GetPlayerImmunity(player).ToString()} probuje wywalic {target.PlayerName} {AdminManager.GetPlayerImmunity(target).ToString()}");
return !player.CanTarget(target) ? HookResult.Stop : HookResult.Continue; return !player.CanTarget(target) ? HookResult.Stop : HookResult.Continue;
} }
} }
@@ -362,8 +360,9 @@ public partial class CS2_SimpleAdmin
if (player is null || @event.Attacker is null || !player.PawnIsAlive || player.PlayerPawn.Value == null) if (player is null || @event.Attacker is null || !player.PawnIsAlive || player.PlayerPawn.Value == null)
return HookResult.Continue; return HookResult.Continue;
if (SpeedPlayers.TryGetValue(player.Slot, out var speedPlayer)) if (SpeedPlayers.TryGetValue(player.Slot, out var speedPlayer))
player.SetSpeed(speedPlayer); AddTimer(0.15f, () => player.SetSpeed(speedPlayer));
if (!GodPlayers.Contains(player.Slot)) return HookResult.Continue; if (!GodPlayers.Contains(player.Slot)) return HookResult.Continue;
@@ -384,19 +383,22 @@ public partial class CS2_SimpleAdmin
SpeedPlayers.Remove(player.Slot); SpeedPlayers.Remove(player.Slot);
GravityPlayers.Remove(player); GravityPlayers.Remove(player);
if (!PlayersInfo.ContainsKey(player.UserId.Value)) if (!PlayersInfo.ContainsKey(player.UserId.Value) || @event.Attacker == null)
return HookResult.Continue; return HookResult.Continue;
var playerPosition = player.PlayerPawn.Value?.AbsOrigin;
var playerRotation = player.PlayerPawn.Value?.AbsRotation;
PlayersInfo[player.UserId.Value].DiePosition = new DiePosition( PlayersInfo[player.UserId.Value].DiePosition = new DiePosition(
new Vector( new Vector(
player.PlayerPawn.Value?.AbsOrigin?.X ?? 0, playerPosition?.X ?? 0,
player.PlayerPawn.Value?.AbsOrigin?.Y ?? 0, playerPosition?.Y ?? 0,
player.PlayerPawn.Value?.AbsOrigin?.Z ?? 0 playerPosition?.Z ?? 0
), ),
new QAngle( new QAngle(
player.PlayerPawn.Value?.AbsRotation?.X ?? 0, playerRotation?.X ?? 0,
player.PlayerPawn.Value?.AbsRotation?.Y ?? 0, playerRotation?.Y ?? 0,
player.PlayerPawn.Value?.AbsRotation?.Z ?? 0 playerRotation?.Z ?? 0
) )
); );

View File

@@ -32,7 +32,8 @@ public static class PlayerExtensions
return AdminManager.CanPlayerTarget(controller, target) || return AdminManager.CanPlayerTarget(controller, target) ||
AdminManager.CanPlayerTarget(new SteamID(controller.SteamID), AdminManager.CanPlayerTarget(new SteamID(controller.SteamID),
new SteamID(target.SteamID)); new SteamID(target.SteamID)) ||
AdminManager.GetPlayerImmunity(controller) >= AdminManager.GetPlayerImmunity(target);
} }
public static void SetSpeed(this CCSPlayerController? controller, float speed) public static void SetSpeed(this CCSPlayerController? controller, float speed)

View File

@@ -159,6 +159,23 @@ internal static class Helper
// Server.ExecuteCommand($"kickid {userId} {reason}"); // Server.ExecuteCommand($"kickid {userId} {reason}");
} }
public static void KickPlayer(CCSPlayerController player, NetworkDisconnectionReason reason = NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKED)
{
player.Disconnect(reason);
// if (!string.IsNullOrEmpty(reason))
// {
// var escapeChars = reason.IndexOfAny([';', '|']);
//
// if (escapeChars != -1)
// {
// reason = reason[..escapeChars];
// }
// }
//
// Server.ExecuteCommand($"kickid {userId} {reason}");
}
public static void PrintToCenterAll(string message) public static void PrintToCenterAll(string message)
{ {
Utilities.GetPlayers().Where(p => p is { IsValid: true, IsBot: false, IsHLTV: false }).ToList().ForEach(controller => Utilities.GetPlayers().Where(p => p is { IsValid: true, IsBot: false, IsHLTV: false }).ToList().ForEach(controller =>

View File

@@ -123,7 +123,11 @@ internal class BanManager(Database.Database? database)
try try
{ {
var sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode ? """ string sql;
if (CS2_SimpleAdmin.Instance.Config.OtherSettings.CheckMultiAccountsByIp)
{
sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode ? """
SELECT COALESCE(( SELECT COALESCE((
SELECT COUNT(*) SELECT COUNT(*)
FROM sa_bans FROM sa_bans
@@ -172,6 +176,35 @@ internal class BanManager(Database.Database? database)
) )
), 0) AS TotalBanCount; ), 0) AS TotalBanCount;
"""; """;
}
else
{
sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode ? """
UPDATE sa_bans
SET player_ip = CASE WHEN player_ip IS NULL THEN @PlayerIP ELSE player_ip END,
player_name = CASE WHEN player_name IS NULL THEN @PlayerName ELSE player_name END
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime);
SELECT COUNT(*) FROM sa_bans
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime);
""" : """
UPDATE sa_bans
SET player_ip = CASE WHEN player_ip IS NULL THEN @PlayerIP ELSE player_ip END,
player_name = CASE WHEN player_name IS NULL THEN @PlayerName ELSE player_name END
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime) AND server_id = @ServerId;
SELECT COUNT(*) FROM sa_bans
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime) AND server_id = @ServerId;
""";
}
await using var connection = await database.GetConnectionAsync(); await using var connection = await database.GetConnectionAsync();

View File

@@ -90,12 +90,11 @@ public class PermissionManager(Database.Database? database)
)) ))
.ToList(); .ToList();
/*
foreach (var player in groupedPlayers) // foreach (var player in groupedPlayers)
{ // {
Console.WriteLine($"Player SteamID: {player.PlayerSteamId}, Name: {player.PlayerName}, Flags: {string.Join(", ", player.Flags)}, Immunity: {player.Immunity}, Ends: {player.Ends}"); // Console.WriteLine($"Player SteamID: {player.PlayerSteamId}, Name: {player.PlayerName}, Flags: {string.Join(", ", player.Flags)}, Immunity: {player.Immunity}, Ends: {player.Ends}");
} // }
*/
List<(string, string, List<string>, int, DateTime?)> filteredFlagsWithImmunity = []; List<(string, string, List<string>, int, DateTime?)> filteredFlagsWithImmunity = [];

View File

@@ -16,15 +16,26 @@ public class PlayerManager
public void LoadPlayerData(CCSPlayerController player) public void LoadPlayerData(CCSPlayerController player)
{ {
if (player.IsBot || string.IsNullOrEmpty(player.IpAddress) || player.IpAddress.Contains("127.0.0.1") if (player.IsBot || string.IsNullOrEmpty(player.IpAddress) || player.IpAddress.Contains("127.0.0.1"))
|| !player.UserId.HasValue)
return; return;
if (!player.UserId.HasValue)
{
Helper.KickPlayer(player, NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_INVALIDCONNECTION);
return;
}
var ipAddress = player.IpAddress?.Split(":")[0]; var ipAddress = player.IpAddress?.Split(":")[0];
CS2_SimpleAdmin.PlayersInfo[player.UserId.Value] = CS2_SimpleAdmin.PlayersInfo[player.UserId.Value] =
new PlayerInfo(player.UserId.Value, player.Slot, new SteamID(player.SteamID), player.PlayerName, ipAddress); new PlayerInfo(player.UserId.Value, player.Slot, new SteamID(player.SteamID), player.PlayerName, ipAddress);
// if (!player.UserId.HasValue)
// {
// Helper.KickPlayer(player, NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_INVALIDCONNECTION);
// return;
// }
var userId = player.UserId.Value; var userId = player.UserId.Value;
// Check if the player's IP or SteamID is in the bannedPlayers list // Check if the player's IP or SteamID is in the bannedPlayers list
@@ -32,8 +43,7 @@ public class PlayerManager
CS2_SimpleAdmin.BannedPlayers.Contains(player.SteamID.ToString())) CS2_SimpleAdmin.BannedPlayers.Contains(player.SteamID.ToString()))
{ {
// Kick the player if banned // Kick the player if banned
if (player.UserId.HasValue) Helper.KickPlayer(player.UserId.Value, NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED);
Helper.KickPlayer(player.UserId.Value, NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED);
return; return;
} }
@@ -113,7 +123,7 @@ public class PlayerManager
{ {
var victim = Utilities.GetPlayerFromUserid(userId); var victim = Utilities.GetPlayerFromUserid(userId);
if (victim?.UserId == null) return; if (victim == null || !victim.UserId.HasValue) return;
if (CS2_SimpleAdmin.UnlockedCommands) if (CS2_SimpleAdmin.UnlockedCommands)
Server.ExecuteCommand($"banid 1 {userId}"); Server.ExecuteCommand($"banid 1 {userId}");

View File

@@ -11,11 +11,11 @@ public class ServerManager
public void LoadServerData() public void LoadServerData()
{ {
CS2_SimpleAdmin.Instance.AddTimer(2.0f, () => CS2_SimpleAdmin.Instance.AddTimer(1.2f, () =>
{ {
if (CS2_SimpleAdmin.ServerLoaded || CS2_SimpleAdmin.ServerId != null || CS2_SimpleAdmin.Database == null) return; if (CS2_SimpleAdmin.ServerLoaded || CS2_SimpleAdmin.ServerId != null || CS2_SimpleAdmin.Database == null) return;
if (_getIpTryCount > 16 && Helper.GetServerIp().StartsWith("0.0.0.0") || string.IsNullOrEmpty(Helper.GetServerIp())) if (_getIpTryCount > 32 && Helper.GetServerIp().StartsWith("0.0.0.0") || string.IsNullOrEmpty(Helper.GetServerIp()))
{ {
CS2_SimpleAdmin._logger?.LogError("Unable to load server data - can't fetch ip address!"); CS2_SimpleAdmin._logger?.LogError("Unable to load server data - can't fetch ip address!");
return; return;
@@ -27,7 +27,7 @@ public class ServerManager
{ {
ipAddress = Helper.GetServerIp(); ipAddress = Helper.GetServerIp();
if (_getIpTryCount <= 16) if (_getIpTryCount <= 32)
{ {
_getIpTryCount++; _getIpTryCount++;

View File

@@ -1 +1 @@
1.6.9a 1.6.9c

View File

@@ -4,8 +4,8 @@
"sa_unknown": "未知", "sa_unknown": "未知",
"sa_no_permission": "您没有权限使用此命令。", "sa_no_permission": "您没有权限使用此命令。",
"sa_ban_max_duration_exceeded": "禁令持续时间不能超过{lightred}{0}{default}分钟。", "sa_ban_max_duration_exceeded": "禁止时长不能超过 {lightred}{0}{default} 分钟。",
"sa_ban_perm_restricted": "您没有永久封禁的权限。", "sa_ban_perm_restricted": "您没有永久禁止权限。",
"sa_admin_add": "添加管理员", "sa_admin_add": "添加管理员",
"sa_admin_remove": "移除管理员", "sa_admin_remove": "移除管理员",
@@ -15,7 +15,7 @@
"sa_noclip": "穿墙模式", "sa_noclip": "穿墙模式",
"sa_respawn": "重生", "sa_respawn": "重生",
"sa_give_weapon": "给予武器", "sa_give_weapon": "给予武器",
"sa_strip_weapons": "剥夺武器", "sa_strip_weapons": "移除武器",
"sa_freeze": "冻结", "sa_freeze": "冻结",
"sa_set_hp": "设置生命值", "sa_set_hp": "设置生命值",
"sa_set_speed": "设置速度", "sa_set_speed": "设置速度",
@@ -23,22 +23,22 @@
"sa_set_money": "设置金钱", "sa_set_money": "设置金钱",
"sa_changemap": "更换地图", "sa_changemap": "更换地图",
"sa_restart_game": "重游戏", "sa_restart_game": "重新开始游戏",
"sa_team_ct": "CT", "sa_team_ct": "CT",
"sa_team_t": "T", "sa_team_t": "T",
"sa_team_swap": "交换", "sa_team_swap": "交换",
"sa_team_spec": "观", "sa_team_spec": "观察者",
"sa_slap": "掌掴", "sa_slap": "掌掴",
"sa_slay": "杀", "sa_slay": "杀",
"sa_kick": "踢出", "sa_kick": "踢出",
"sa_ban": "禁", "sa_ban": "禁",
"sa_gag": "禁言", "sa_gag": "禁言",
"sa_mute": "静音", "sa_mute": "静音",
"sa_silence": "沉默", "sa_silence": "沉默",
"sa_warn": "警告", "sa_warn": "警告",
"sa_team_force": "强制队", "sa_team_force": "强制队",
"sa_menu_custom_commands": "自定义命令", "sa_menu_custom_commands": "自定义命令",
"sa_menu_server_manage": "服务器管理", "sa_menu_server_manage": "服务器管理",
@@ -47,88 +47,86 @@
"sa_menu_players_manage": "玩家管理", "sa_menu_players_manage": "玩家管理",
"sa_menu_disconnected_title": "最近的玩家", "sa_menu_disconnected_title": "最近的玩家",
"sa_menu_disconnected_action_title": "选择操作", "sa_menu_disconnected_action_title": "选择操作",
"sa_menu_pluginsmanager_title": "管理插件", "sa_menu_pluginsmanager_title": "插件管理",
"sa_player": "玩家", "sa_player": "玩家",
"sa_console": "控制台", "sa_console": "控制台",
"sa_steamid": "SteamID", "sa_steamid": "SteamID",
"sa_duration": "持续时间", "sa_duration": "时长",
"sa_reason": "原因", "sa_reason": "原因",
"sa_admin": "管理员", "sa_admin": "管理员",
"sa_permanent": "永久", "sa_permanent": "永久",
"sa_discord_penalty_ban": "封禁已记录", "sa_discord_penalty_ban": "禁止记录",
"sa_discord_penalty_mute": "禁言已记录", "sa_discord_penalty_mute": "静音记录",
"sa_discord_penalty_gag": "禁言记录", "sa_discord_penalty_gag": "禁言记录",
"sa_discord_penalty_silence": "禁声已记录", "sa_discord_penalty_silence": "沉默记录",
"sa_discord_penalty_warn": "警告已注册", "sa_discord_penalty_warn": "警告记录",
"sa_discord_penalty_unknown": "未知记录", "sa_discord_penalty_unknown": "未知记录",
"sa_player_penalty_chat_active": "{lightred}您的聊天已被封锁到: {grey}{0}", "sa_player_penalty_info_active_mute": "➔ 静音 [{lightred}❌{default}] - 将于 [{lightred}{0}{default}] 过期",
"sa_player_penalty_info_active_gag": "➔ 禁言 [{lightred}❌{default}] - 将于 [{lightred}{0}{default}] 过期",
"sa_player_penalty_info_active_mute": "➔ 静音 [{lightred}❌{default}] - 到期 [{lightred}{0}{default}]", "sa_player_penalty_info_active_silence": "➔ 沉默 [{lightred}❌{default}] - 将于 [{lightred}{0}{default}] 过期",
"sa_player_penalty_info_active_gag": "➔ 禁言 [{lightred}❌{default}] - 到期 [{lightred}{0}{default}]", "sa_player_penalty_info_active_warn": "➔ 警告 [{lightred}❌{default}] - 将于 [{lightred}{0}{default}] 过期 - 原因 [{lightred}{1}{default}]",
"sa_player_penalty_info_active_silence": "➔ 沉默 [{lightred}❌{default}] - 到期 [{lightred}{0}{default}]",
"sa_player_penalty_info_active_warn": "➔ 警告 [{lightred}❌{default}] - 到期 [{lightred}{0}{default}] - 原因 [{lightred}{1}{default}]",
"sa_player_penalty_info_no_active_mute": "➔ 静音 [{lime}✔{default}]", "sa_player_penalty_info_no_active_mute": "➔ 静音 [{lime}✔{default}]",
"sa_player_penalty_info_no_active_gag": "➔ 禁言 [{lime}✔{default}]", "sa_player_penalty_info_no_active_gag": "➔ 禁言 [{lime}✔{default}]",
"sa_player_penalty_info_no_active_silence": "➔ 沉默 [{lime}✔{default}]", "sa_player_penalty_info_no_active_silence": "➔ 沉默 [{lime}✔{default}]",
"sa_player_penalty_info_no_active_warn": "➔ 警告 [{lime}✔{default}]", "sa_player_penalty_info_no_active_warn": "➔ 警告 [{lime}✔{default}]",
"sa_player_penalty_info": "===========================\n玩家处罚信息 {lightred}{0}{default}\n禁次数: {lightred}{1}{default}, 禁言次数: {lightred}{2}{default}, 静音次数: {lightred}{3}{default}, 沉默次数: {lightred}{4}{default}, 警告次数: {lightred}{5}{default}\n当前处罚:\n{6}\n当前警告:\n{7}\n===========================", "sa_player_penalty_info": "===========================\n玩家 {lightred}{0}{default} 的处罚信息,\n禁次数: {lightred}{1}{default}, 禁言次数: {lightred}{2}{default}, 静音次数: {lightred}{3}{default}, 沉默次数: {lightred}{4}{default}, 警告次数: {lightred}{5}{default}\n活跃的处罚:\n{6}\n活跃的警告:\n{7}\n===========================",
"sa_admin_penalty_info": "{grey}玩家处罚信息 {lightred}{0}{grey}, 禁: {lightred}{1}{grey}, 禁言: {lightred}{2}{grey}, 静音: {lightred}{3}{grey}, 沉默: {lightred}{4}{grey}, 警告: {lightred}{5}", "sa_admin_penalty_info": "{grey}玩家 {lightred}{0}{grey} 的处罚信息, 禁: {lightred}{1}{grey}, 禁言: {lightred}{2}{grey}, 静音: {lightred}{3}{grey}, 沉默: {lightred}{4}{grey}, 警告: {lightred}{5}",
"sa_player_ban_message_time": "你因为{lightred}{0}{default}的原因被{lightred}{1}{default}禁止{lightred}{2}{default}分钟", "sa_player_ban_message_time": "您已被 {lightred}{0}{default}{lightred}{2}{default} 禁止 {lightred}{1}{default} 分钟!",
"sa_player_ban_message_perm": "你因为{lightred}{0}{default}的原因被{lightred}{1}{default}永久禁止", "sa_player_ban_message_perm": "您已被 {lightred}{0}{default}{lightred}{1}{default} 永久禁止!",
"sa_player_kick_message": "你因为{lightred}{0}{default}的原因被{lightred}{1}{default}踢出", "sa_player_kick_message": "您已被 {lightred}{0}{default}{lightred}{1}{default} 踢出!",
"sa_player_gag_message_time": "你因为{lightred}{0}{default}的原因被{lightred}{2}{default}禁言{lightred}{1}{default}分钟", "sa_player_gag_message_time": "您已被 {lightred}{0}{default}{lightred}{2}{default} 禁言 {lightred}{1}{default} 分钟!",
"sa_player_gag_message_perm": "你因为{lightred}{0}{default}的原因被{lightred}{1}{default}永久禁言", "sa_player_gag_message_perm": "您已被 {lightred}{0}{default}{lightred}{1}{default} 永久禁言!",
"sa_player_mute_message_time": "你因为{lightred}{0}{default}的原因被{lightred}{2}{default}禁声{lightred}{1}{default}分钟", "sa_player_mute_message_time": "您已被 {lightred}{0}{default}{lightred}{2}{default} 静音 {lightred}{1}{default} 分钟!",
"sa_player_mute_message_perm": "你因为{lightred}{0}{default}的原因被{lightred}{1}{default}永久禁声!", "sa_player_mute_message_perm": "您已被 {lightred}{0}{default}{lightred}{1}{default} 永久静音!",
"sa_player_silence_message_time": "你因为{lightred}{0}{default}的原因被{lightred}{2}{default}禁止发言{lightred}{1}{default}分钟", "sa_player_silence_message_time": "您已被 {lightred}{0}{default}{lightred}{2}{default} 沉默 {lightred}{1}{default} 分钟!",
"sa_player_silence_message_perm": "你因为{lightred}{0}{default}的原因被{lightred}{1}{default}永久禁止发言!", "sa_player_silence_message_perm": "您已被 {lightred}{0}{default}{lightred}{1}{default} 永久沉默!",
"sa_player_warn_message_time": "您 {lightred}{0}{default} {lightred}{1}{default} 分钟内由 {lightred}{2}{default} 警告!", "sa_player_warn_message_time": "您已被 {lightred}{0}{default} {lightred}{2}{default} 警告 {lightred}{1}{default} 分钟!",
"sa_player_warn_message_perm": "您 {lightred}{0}{default} {lightred}{1}{default} 永久警告", "sa_player_warn_message_perm": "您已被 {lightred}{0}{default} {lightred}{1}{default} 永久警告!",
"sa_admin_ban_message_time": "{lightred}{0}{default} 因为 {lightred}{1}{default} {lightred}{2}{default} 禁言 {lightred}{3}{default} 分钟!", "sa_admin_ban_message_time": "{lightred}{0}{default} 禁止了 {lightred}{1}{default} {lightred}{2}{default} {lightred}{3}{default} 分钟!",
"sa_admin_ban_message_perm": "{lightred}{0}{default} 因为 {lightred}{1}{default} 被永久禁言 {lightred}{2}{default}!", "sa_admin_ban_message_perm": "{lightred}{0}{default} 永久禁止了 {lightred}{1}{default} {lightred}{2}{default}!",
"sa_admin_kick_message": "{lightred}{0}{default} 因为 {lightred}{1}{default} 被踢出!", "sa_admin_kick_message": "{lightred}{0}{default} 踢出了 {lightred}{1}{default} 因 {lightred}{2}{default}!",
"sa_admin_gag_message_time": "{lightred}{0}{default} 因为 {lightred}{1}{default} {lightred}{2}{default} 禁言 {lightred}{3}{default} 分钟!", "sa_admin_gag_message_time": "{lightred}{0}{default} 禁言了 {lightred}{1}{default} {lightred}{2}{default} {lightred}{3}{default} 分钟!",
"sa_admin_gag_message_perm": "{lightred}{0}{default} 因为 {lightred}{1}{default} 被永久禁言 {lightred}{2}{default}!", "sa_admin_gag_message_perm": "{lightred}{0}{default} 永久禁言了 {lightred}{1}{default} {lightred}{2}{default}!",
"sa_admin_mute_message_time": "{lightred}{0}{default} 因为 {lightred}{1}{default} 的声音被 {lightred}{2}{default} 禁言 {lightred}{3}{default} 分钟!", "sa_admin_mute_message_time": "{lightred}{0}{default} 静音了 {lightred}{1}{default} {lightred}{2}{default} {lightred}{3}{default} 分钟!",
"sa_admin_mute_message_perm": "{lightred}{0}{default} 因为 {lightred}{1}{default} 的声音被永久禁言 {lightred}{2}{default}!", "sa_admin_mute_message_perm": "{lightred}{0}{default} 永久静音了 {lightred}{1}{default} {lightred}{2}{default}!",
"sa_admin_silence_message_time": "{lightred}{0}{default} 因为 {lightred}{1}{default} {lightred}{2}{default} 禁言 {lightred}{3}{default} 分钟!", "sa_admin_silence_message_time": "{lightred}{0}{default} 沉默了 {lightred}{1}{default} {lightred}{2}{default} {lightred}{3}{default} 分钟!",
"sa_admin_silence_message_perm": "{lightred}{0}{default} 因为 {lightred}{1}{default} 被永久禁言 {lightred}{2}{default}!", "sa_admin_silence_message_perm": "{lightred}{0}{default} 永久沉默了 {lightred}{1}{default} {lightred}{2}{default}!",
"sa_admin_warn_message_time": "{lightred}{0}{default} 因为 {lightred}{1}{default} 被警告 {lightred}{2}{default} {lightred}{3}{default} 分钟!", "sa_admin_warn_message_time": "{lightred}{0}{default} 警告了 {lightred}{1}{default} {lightred}{2}{default} {lightred}{3}{default} 分钟!",
"sa_admin_warn_message_perm": "{lightred}{0}{default} 因为 {lightred}{1}{default} 被永久警告 {lightred}{2}{default}!", "sa_admin_warn_message_perm": "{lightred}{0}{default} 永久警告了 {lightred}{1}{default} {lightred}{2}{default}!",
"sa_admin_give_message": "{lightred}{0}{default} 给了 {lightred}{1}{default} {lightred}{2}{default}!", "sa_admin_give_message": "{lightred}{0}{default} 给了 {lightred}{1}{default} {lightred}{2}{default}!",
"sa_admin_strip_message": "{lightred}{0}{default} 拿走了 {lightred}{1}{default} 的所有武器!", "sa_admin_strip_message": "{lightred}{0}{default} 移除了 {lightred}{1}{default} 的所有武器!",
"sa_admin_hp_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的生命值!", "sa_admin_hp_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的生命值!",
"sa_admin_speed_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的速度!", "sa_admin_speed_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的速度!",
"sa_admin_gravity_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的重力!", "sa_admin_gravity_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的重力!",
"sa_admin_money_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的金钱!", "sa_admin_money_message": "{lightred}{0}{default} 改了 {lightred}{1}{default} 的金钱!",
"sa_admin_god_message": "{lightred}{0}{default} 改变了 {lightred}{1}{default} 的上帝模式!", "sa_admin_god_message": "{lightred}{0}{default} 切换了 {lightred}{1}{default} 的上帝模式!",
"sa_admin_slay_message": "{lightred}{0}{default} 杀了 {lightred}{1}{default}!", "sa_admin_slay_message": "{lightred}{0}{default} 杀了 {lightred}{1}{default}!",
"sa_admin_slap_message": "{lightred}{0}{default} 了 {lightred}{1}{default} 一巴掌!", "sa_admin_slap_message": "{lightred}{0}{default} 掌掴了 {lightred}{1}{default}!",
"sa_admin_changemap_message": "{lightred}{0}{default} 更改了地图为 {lightred}{1}{default}!", "sa_admin_changemap_message": "{lightred}{0}{default} 将地图更换为 {lightred}{1}{default}!",
"sa_admin_noclip_message": "{lightred}{0}{default} {lightred}{1}{default} 切换了 noclip!", "sa_admin_noclip_message": "{lightred}{0}{default} 切换了 {lightred}{1}{default} 的穿墙模式!",
"sa_admin_freeze_message": "{lightred}{0}{default} 冻结了 {lightred}{1}{default}!", "sa_admin_freeze_message": "{lightred}{0}{default} 冻结了 {lightred}{1}{default}!",
"sa_admin_unfreeze_message": "{lightred}{0}{default} 解冻了 {lightred}{1}{default}!", "sa_admin_unfreeze_message": "{lightred}{0}{default} 解冻了 {lightred}{1}{default}!",
"sa_admin_rename_message": "{lightred}{0}{default} 更改了 {lightred}{1}{default} 的昵称为 {lightred}{2}{default}!", "sa_admin_rename_message": "{lightred}{0}{default} {lightred}{1}{default} 的昵称为 {lightred}{2}{default}!",
"sa_admin_respawn_message": "{lightred}{0}{default} 重新生成了 {lightred}{1}{default}!", "sa_admin_respawn_message": "{lightred}{0}{default} 复活了 {lightred}{1}{default}!",
"sa_admin_tp_message": "{lightred}{0}{default} 传送到 {lightred}{1}{default}!", "sa_admin_tp_message": "{lightred}{0}{default} 传送到 {lightred}{1}{default}!",
"sa_admin_bring_message": "{lightred}{0}{default} 将 {lightred}{1}{default} 传送到自己身边!", "sa_admin_bring_message": "{lightred}{0}{default} 将 {lightred}{1}{default} 传送到自己!",
"sa_admin_team_message": "{lightred}{0}{default} 将 {lightred}{1}{default} 转移到 {lightred}{2}{default} 队伍!", "sa_admin_team_message": "{lightred}{0}{default} 将 {lightred}{1}{default} 转移到 {lightred}{2}{default} 队伍!",
"sa_admin_warns_menu_title": "{gold}{0} {lime}警告", "sa_admin_warns_menu_title": "{gold}{0} {lime}警告",
"sa_admin_warns_unwarn": "{lime}成功{default} 取消了对 {gold}{0}{default} 的警告 {gold}{1}{default}!", "sa_admin_warns_unwarn": "{lime}成功移除警告{default} {gold}{0} 对于 {gold}{1}{default}!",
"sa_admin_vote_menu_title": "{lime}投票 {gold}{0}", "sa_admin_vote_menu_title": "{lime}投票 {gold}{0}",
"sa_admin_vote_message": "{lightred}{0}{default} 开始为 {lightred}{1}{default} 进行投票", "sa_admin_vote_message": "{lightred}{0}{default} 发起了 [{lightred}{1}{default}] 的投票",
"sa_admin_vote_message_results": "{lime}投票结果 {gold}{0}", "sa_admin_vote_message_results": "{lime}投票结果 {gold}{0}",
"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}", "sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
"sa_adminsay_prefix": "{RED}管理员: {lightred}{0}{default}", "sa_adminsay_prefix": "{RED}管理员: {lightred}{0}{default}",
"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}", "sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
"sa_adminchat_template_admin": "{LIME}(管理员) {lightred}{0}{default}: {lightred}{1}{default}", "sa_adminchat_template_admin": "{LIME}(管理员) {lightred}{0}{default}: {lightred}{1}{default}",
"sa_adminchat_template_player": "{SILVER}(玩家) {lightred}{0}{default}: {lightred}{1}{default}", "sa_adminchat_template_player": "{SILVER}(玩家) {lightred}{0}{default}: {lightred}{1}{default}",
"sa_discord_log_command": "**{0}** 在服务器 `HOSTNAME` 上发出了 `{1}` 命令", "sa_discord_log_command": "**{0}** 在服务器 `HOSTNAME` 上执行了命令 `{1}`",
"sa_menu_pluginsmanager_loaded": "{lime}已启用 {default}插件 {lime}{0}", "sa_menu_pluginsmanager_loaded": "{lime}激活了 {default}插件 {lime}{0}",
"sa_menu_pluginsmanager_unloaded": "{lightred}已禁用 {default}插件 {lightred}{0}" "sa_menu_pluginsmanager_unloaded": "{lightred}停用了 {default}插件 {lightred}{0}"
} }

View File

@@ -28,8 +28,8 @@ public class PlayerInfo(
public DiePosition? DiePosition { get; set; } public DiePosition? DiePosition { get; set; }
} }
public struct DiePosition(Vector? position = null, QAngle? angle = null) public struct DiePosition(Vector position, QAngle angle)
{ {
public Vector? Position { get; set; } = position; public Vector Position { get; set; } = position;
public QAngle? Angle { get; set; } = angle; public QAngle Angle { get; set; } = angle;
} }