Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2024-11-12 10:44:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix command-execute flag.

Browse Source
This commit is contained in:
bloodshot 2019-12-18 20:38:17 -05:00
parent f2a13b9539
commit d81c21955c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
View File

@ -281,16 +281,18 @@ public void onPlayerCommand(SendCommandEvent event, @First Player player) {
GDTimings.PLAYER_COMMAND_EVENT.stopTimingIfSync(); GDTimings.PLAYER_COMMAND_EVENT.stopTimingIfSync();
return; return;
} }
String commandPermission = pluginId + "." + command;
String commandTarget = pluginId + ":" + command;
// first check the args // first check the args
String argument = "";
for (String arg : args) { for (String arg : args) {
argument = argument + "." + arg; if (!arg.isEmpty()) {
commandTarget = commandTarget + "." + arg;
}
} }
if (GDFlags.COMMAND_EXECUTE && !commandExecuteSourceBlacklisted && !GriefDefenderPlugin.isTargetIdBlacklisted(Flags.COMMAND_EXECUTE.getName(), commandPermission + argument, player.getWorld().getProperties())) { if (GDFlags.COMMAND_EXECUTE && !commandExecuteSourceBlacklisted) {
final Tristate result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandPermission + argument, player); final Tristate result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandTarget, player);
if (result == Tristate.TRUE) { if (result == Tristate.TRUE) {
GDTimings.PLAYER_COMMAND_EVENT.stopTimingIfSync(); GDTimings.PLAYER_COMMAND_EVENT.stopTimingIfSync();
return; return;