From ff27faa69c4e4597bb3705a8dcfb6b7d1881f104 Mon Sep 17 00:00:00 2001 From: bloodshot Date: Sat, 28 Dec 2019 17:39:27 -0500 Subject: [PATCH] Fix command overrides. Fixes #89 --- sponge/src/main/java/com/griefdefender/GDBootstrap.java | 2 +- .../java/com/griefdefender/listener/PlayerEventHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sponge/src/main/java/com/griefdefender/GDBootstrap.java b/sponge/src/main/java/com/griefdefender/GDBootstrap.java index 601462e..c3c1887 100644 --- a/sponge/src/main/java/com/griefdefender/GDBootstrap.java +++ b/sponge/src/main/java/com/griefdefender/GDBootstrap.java @@ -61,7 +61,7 @@ import java.util.Map; @Plugin(id = "griefdefender", name = "GriefDefender", version = "1.2.4", description = "Designed to defend world from all types of grief.", - authors = {"bloodmc"}, dependencies = {@Dependency(id = "luckperms", optional = true)}) + authors = {"bloodmc"}, dependencies = {@Dependency(id = "luckperms")}) public class GDBootstrap { @Inject public PluginContainer pluginContainer; diff --git a/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java b/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java index 6e42bfb..bdc89b4 100644 --- a/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java +++ b/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java @@ -300,10 +300,10 @@ public void onPlayerCommand(SendCommandEvent event, @First Player player) { if (GDFlags.COMMAND_EXECUTE && !commandExecuteSourceBlacklisted && !commandExecuteTargetBlacklisted) { // First check base command - Tristate result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandBaseTarget, player); + Tristate result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandBaseTarget, player, true); if (result != Tristate.FALSE) { // check with args - result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandTargetWithArgs, player); + result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandTargetWithArgs, player, true); } if (result == Tristate.FALSE) { final Component denyMessage = GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.COMMAND_BLOCKED,