Merge branch 'main' into feature/menu

# Conflicts:
#	CS2-SimpleAdmin.cs
#	Config.cs
#	Extensions/PlayerExtensions.cs
This commit is contained in:
Valentin Barat
2024-02-12 14:40:55 +01:00
22 changed files with 3057 additions and 2759 deletions

View File

@@ -3,7 +3,15 @@ using System.Text.Json.Serialization;
namespace CS2_SimpleAdmin
{
public class CS2_SimpleAdminConfig: BasePluginConfig
public class Discord
{
[JsonPropertyName("DiscordLogWebhook")]
public string DiscordLogWebhook { get; set; } = "";
[JsonPropertyName("DiscordPenaltyWebhook")]
public string DiscordPenaltyWebhook { get; set; } = "";
}
public class CS2_SimpleAdminConfig : BasePluginConfig
{
public override int Version { get; set; } = 6;
@@ -34,10 +42,10 @@ namespace CS2_SimpleAdmin
[JsonPropertyName("TeamSwitchType")]
public int TeamSwitchType { get; set; } = 1;
[JsonPropertyName("DiscordWebhook")]
public string DiscordWebhook { get; set; } = "";
[JsonPropertyName("Discord")]
public Discord Discord { get; set; } = new Discord();
[JsonPropertyName("WorkshopMaps")]
public List<string> WorkshopMaps { get; set; } = new List<string>();
}
}
}