From 2b252c562ef3bba1a05d389bbd7c59feeb65f4b5 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Sat, 2 Dec 2023 23:26:54 +0100 Subject: [PATCH] Added central admin command access check, so we can't give access to admin commands to the public by accident --- .../support/global/commands/CommandQueueService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java b/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java index 0f0417c7e..f7de78615 100644 --- a/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java +++ b/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java @@ -47,6 +47,8 @@ import com.projectswg.holocore.resources.support.global.commands.CombatCommand; import com.projectswg.holocore.resources.support.global.commands.Command; import com.projectswg.holocore.resources.support.global.commands.Locomotion; import com.projectswg.holocore.resources.support.global.commands.State; +import com.projectswg.holocore.resources.support.global.player.AccessLevel; +import com.projectswg.holocore.resources.support.global.player.Player; import com.projectswg.holocore.resources.support.global.player.PlayerEvent; import com.projectswg.holocore.resources.support.objects.swg.SWGObject; import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject; @@ -417,7 +419,11 @@ public class CommandQueueService extends Service { if (requiredCharacterAbility.equalsIgnoreCase("admin")) { // To prevent admin commands only being usable when in God Mode - return false; + Player owner = source.getOwner(); + + if (owner != null) { + return owner.getAccessLevel() == AccessLevel.PLAYER; + } } return !characterAbilities.contains(requiredCharacterAbility);