diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java index 0105abad..36cf05e3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java @@ -128,9 +128,6 @@ public class SteamWarLuaPlugin extends TwoArgFunction { Bukkit.getLogger().log(Level.INFO, player.getName() + " dispatched command: " + command); String[] commandSplit = command.split(" "); if (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) { - if (!Permission.BUILD.hasPermission(player)) { - return NIL; - } EditSession editSession = WorldEditUtils.getEditSession(player); Actor actor = BukkitAdapter.adapt(player); WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().handleCommandOnCurrentThread(new CommandEvent(actor, command, editSession)); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java index c3acab82..9a93977e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java @@ -117,23 +117,21 @@ public class BindCommand extends SWCommand implements Listener { event.setCancelled(true); Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> { - PlayerCommandPreprocessEvent playerCommandPreprocessEvent = new PlayerCommandPreprocessEvent(event.getPlayer(), "/" + command); - Bukkit.getPluginManager().callEvent(playerCommandPreprocessEvent); - if (playerCommandPreprocessEvent.isCancelled()) return; + PlayerCommandPreprocessEvent preprocessEvent = new PlayerCommandPreprocessEvent(event.getPlayer(), "/" + command); + Bukkit.getPluginManager().callEvent(preprocessEvent); + if (preprocessEvent.isCancelled()) return; - Bukkit.getLogger().log(Level.INFO, event.getPlayer().getName() + " dispatched command: " + command); - String[] commandSplit = command.split(" "); + String processedCommand = preprocessEvent.getMessage().substring(1); + Bukkit.getLogger().log(Level.INFO, event.getPlayer().getName() + " dispatched command: " + processedCommand); + String[] commandSplit = processedCommand.split(" "); if (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) { - if (!Permission.WORLDEDIT.hasPermission(event.getPlayer())) { - return; - } EditSession editSession = WorldEditUtils.getEditSession(event.getPlayer()); Actor actor = BukkitAdapter.adapt(event.getPlayer()); - WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().handleCommandOnCurrentThread(new CommandEvent(actor, command, editSession)); + WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().handleCommandOnCurrentThread(new CommandEvent(actor, processedCommand, editSession)); editSession.flushSession(); WorldEditUtils.addToPlayer(event.getPlayer(), editSession); } else { - Bukkit.getServer().dispatchCommand(event.getPlayer(), command); + Bukkit.getServer().dispatchCommand(event.getPlayer(), processedCommand); } }, 1); }