diff --git a/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin.cs index e7fbd9e..9882760 100644 --- a/CS2-SimpleAdmin.cs +++ b/CS2-SimpleAdmin.cs @@ -26,7 +26,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig( - "SELECT `id`, `group_ids` FROM `sa_servers` WHERE `address` = @address", + (int? serverId, string? groupId) = await connection.QueryFirstAsync<(int?, string?)>( + "SELECT `id`, `group_id` FROM `sa_servers` WHERE `address` = @address", new { address }); ServerId = serverId; - if (groupIds != null && groupIds.Length > 0) + if (groupId != null && groupId.Length > 0) { // Split the group ids by comma and parse them to integers - GroupIds = groupIds?.Split(',').Select(int.Parse).ToArray(); + GroupId = groupId?.Split(',').Select(int.Parse).ToArray(); } else { // We must set it to null if it's empty to ensure reloads work properly - GroupIds = null; + GroupId = null; } } diff --git a/Managers/AdminSQLManager.cs b/Managers/AdminSQLManager.cs index 7000c05..e965ca0 100644 --- a/Managers/AdminSQLManager.cs +++ b/Managers/AdminSQLManager.cs @@ -28,7 +28,7 @@ public class AdminSQLManager await using MySqlConnection connection = await _database.GetConnectionAsync(); - string groupId = CS2_SimpleAdmin.GroupIds != null ? string.Join("", CS2_SimpleAdmin.GroupIds) : string.Empty; + string groupId = CS2_SimpleAdmin.GroupId != null ? string.Join("", CS2_SimpleAdmin.GroupId) : string.Empty; string sql = "SELECT flags, immunity, ends FROM sa_admins WHERE player_steamid = @PlayerSteamID AND (ends IS NULL OR ends > @CurrentTime) AND ((server_id IS NULL OR server_id = @serverid) OR ((@groupid IS NOT NULL AND @groupid <> 0) AND group_id LIKE CONCAT('%', @groupid, '%')));"; List? activeFlags = (await connection.QueryAsync(sql, new { PlayerSteamID = steamId, CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId, groupid = groupId }))?.ToList(); @@ -73,7 +73,7 @@ public class AdminSQLManager { await using MySqlConnection connection = await _database.GetConnectionAsync(); - string groupId = CS2_SimpleAdmin.GroupIds != null ? string.Join("", CS2_SimpleAdmin.GroupIds) : string.Empty; + string groupId = CS2_SimpleAdmin.GroupId != null ? string.Join("", CS2_SimpleAdmin.GroupId) : string.Empty; string sql = "SELECT player_steamid, flags, immunity, ends FROM sa_admins WHERE (ends IS NULL OR ends > @CurrentTime) AND ((server_id IS NULL OR server_id = @serverid) OR ((@groupid IS NOT NULL AND @groupid <> 0) AND group_id LIKE CONCAT('%', @groupid, '%')));"; List? activeFlags = (await connection.QueryAsync(sql, new { CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId, groupid = groupId }))?.ToList();