mirror of
https://github.com/bloodmc/GriefDefender.git
synced 2024-09-25 04:12:51 +02:00
Fix command overrides. Fixes #89
This commit is contained in:
parent
9bd3436a55
commit
ff27faa69c
@ -61,7 +61,7 @@
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@Plugin(id = "griefdefender", name = "GriefDefender", version = "1.2.4", description = "Designed to defend world from all types of grief.",
|
@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 {
|
public class GDBootstrap {
|
||||||
|
|
||||||
@Inject public PluginContainer pluginContainer;
|
@Inject public PluginContainer pluginContainer;
|
||||||
|
@ -300,10 +300,10 @@ public void onPlayerCommand(SendCommandEvent event, @First Player player) {
|
|||||||
|
|
||||||
if (GDFlags.COMMAND_EXECUTE && !commandExecuteSourceBlacklisted && !commandExecuteTargetBlacklisted) {
|
if (GDFlags.COMMAND_EXECUTE && !commandExecuteSourceBlacklisted && !commandExecuteTargetBlacklisted) {
|
||||||
// First check base command
|
// 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) {
|
if (result != Tristate.FALSE) {
|
||||||
// check with args
|
// 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) {
|
if (result == Tristate.FALSE) {
|
||||||
final Component denyMessage = GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.COMMAND_BLOCKED,
|
final Component denyMessage = GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.COMMAND_BLOCKED,
|
||||||
|
Loading…
Reference in New Issue
Block a user