Skip to content

refactor: improve IsServerOwner API #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DevD4v3 merged 1 commit into from
Aug 10, 2026
Merged

refactor: improve IsServerOwner API #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Application/Players/Accounts/Roles/PlayerRoleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void SetRole(
return;
}

if (targetPlayer.IsServerOwner(serverOwnerSettings.Name))
if (targetPlayer.IsServerOwner())
{
currentPlayer.SendClientMessage(Color.Red, Messages.CannotPerformActionOnServerOwner);
return;
Expand Down
5 changes: 2 additions & 3 deletions src/Application/Players/GeneralCommands/AdminCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ public class AdminCommands(
IEntityManager entityManager,
IServerService serverService,
IWorldService worldService,
IDialogService dialogService,
ServerOwnerSettings serverOwnerSettings) : ISystem
IDialogService dialogService) : ISystem
{
[PlayerCommand("cmdsadmin")]
[RequiresMinimumRole(RoleId.Admin)]
Expand Down Expand Up @@ -88,7 +87,7 @@ public void BanPlayer(
return;
}

if (targetPlayer.IsServerOwner(serverOwnerSettings.Name))
if (targetPlayer.IsServerOwner())
{
currentPlayer.SendClientMessage(Color.Red, Messages.CannotPerformActionOnServerOwner);
return;
Expand Down
8 changes: 3 additions & 5 deletions src/Application/Players/GeneralCommands/ModeratorCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
namespace CTF.Application.Players.GeneralCommands;

public class ModeratorCommands(
IWorldService worldService,
ServerOwnerSettings serverOwnerSettings) : ISystem
public class ModeratorCommands(IWorldService worldService) : ISystem
{
[PlayerCommand("cmdsmoderator")]
[RequiresMinimumRole(RoleId.Moderator)]
Expand Down Expand Up @@ -36,7 +34,7 @@ public void Kick(
return;
}

if (targetPlayer.IsServerOwner(serverOwnerSettings.Name))
if (targetPlayer.IsServerOwner())
{
currentPlayer.SendClientMessage(Color.Red, Messages.CannotPerformActionOnServerOwner);
return;
Expand Down Expand Up @@ -105,7 +103,7 @@ public void Warn(
return;
}

if (targetPlayer.IsServerOwner(serverOwnerSettings.Name))
if (targetPlayer.IsServerOwner())
{
currentPlayer.SendClientMessage(Color.Red, Messages.CannotPerformActionOnServerOwner);
return;
Expand Down
15 changes: 8 additions & 7 deletions src/Application/Players/PlayerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,16 @@ public static Team RemoveFromCurrentTeam(this Player player)
/// <param name="player">
/// The player to check.
/// </param>
/// <param name="ownerName">
/// The name configured as the server owner.
/// </param>
/// <returns>
/// <see langword="true"/> if the player's name matches the configured
/// server owner name; otherwise, <see langword="false"/>.
/// <see langword="true"/> if the player is the server owner;
/// otherwise, <see langword="false"/>.
/// </returns>
public static bool IsServerOwner(this Player player, string ownerName)
=> player.Name.Equals(
public static bool IsServerOwner(this Player player)
{
var envReader = new EnvReader();
var ownerName = envReader["ServerOwner__Name"];
return player.Name.Equals(
ownerName,
StringComparison.OrdinalIgnoreCase);
}
}
Loading