Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-12 04:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for console commands to WorldEditPlugin.

Browse Source
This commit is contained in:
TomyLobo
2011-12-15 13:26:59 +01:00
parent 3bec3c169c
commit 370ddeb9ff
6 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -640,7 +640,7 @@ public class LocalSession {
// Create an edit session
EditSession editSession =
new EditSession(player.getWorld(),
new EditSession(player.isPlayer() ? player.getWorld() : null,
getBlockChangeLimit(), blockBag);
editSession.setFastMode(fastMode);
editSession.setMask(mask);

19
src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -28,6 +28,7 @@ import java.lang.reflect.Method;
import javax.script.ScriptException;
import com.sk89q.minecraft.util.commands.*;
import com.sk89q.minecraft.util.commands.Console;
import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
@ -101,6 +102,15 @@ public class WorldEdit {
this.config = config;
commands = new CommandsManager<LocalPlayer>() {
@Override
protected void checkPermission(LocalPlayer player, Method method) throws CommandException {
if (!player.isPlayer() && !method.isAnnotationPresent(Console.class)) {
throw new UnhandledCommandException();
}
super.checkPermission(player, method);
}
@Override
public boolean hasPermission(LocalPlayer player, String perm) {
return player.hasPermission(perm);
@ -120,9 +130,12 @@ public class WorldEdit {
logMode = loggingAnnotation.value();
}
String msg = "WorldEdit: " + player.getName() + " (in \"" + player.getWorld().getName()
+ "\")" + ": " + StringUtil.joinString(args, " ");
if (logMode != null) {
String msg = "WorldEdit: " + player.getName();
if (player.isPlayer()) {
msg += " (in \"" + player.getWorld().getName() + "\")";
}
msg += ": " + StringUtil.joinString(args, " ");
if (logMode != null && player.isPlayer()) {
Vector position = player.getPosition();
final LocalSession session = getSession(player);
switch (logMode) {

28
src/main/java/com/sk89q/worldedit/bukkit/WorldEditCommand.java Normal file
View File

@ -0,0 +1,28 @@
package com.sk89q.worldedit.bukkit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.bukkit.command.CommandSender;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandPermissions;
public class WorldEditCommand extends org.bukkit.command.Command {
public WorldEditCommand(Command command, CommandPermissions commandPermissions) {
super(command.aliases()[0]);
this.description = command.desc();
this.usageMessage = "/"+getName()+" "+command.usage();
List<String> aliases = new ArrayList<String>(Arrays.asList(command.aliases()));
aliases.remove(0);
this.setAliases(aliases);
}
@Override
public boolean execute(CommandSender sender, String currentAlias, String[] args) {
// This method is never called.
return true;
}
}

12
src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -31,7 +31,6 @@ import java.util.zip.ZipEntry;
import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.wepif.PermissionsResolverManager;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority;
@ -222,15 +221,8 @@ public class WorldEditPlugin extends JavaPlugin {
* Called on WorldEdit command.
*/
@Override
public boolean onCommand(CommandSender sender, Command cmd,
public boolean onCommand(CommandSender sender, org.bukkit.command.Command cmd,
String commandLabel, String[] args) {
// Since WorldEdit is primarily made for use in-game, we're going
// to ignore the situation where the command sender is not a player.
if (!(sender instanceof Player)) {
return true;
}
Player player = (Player) sender;
// Add the command to the array because the underlying command handling
// code of WorldEdit expects it
@ -238,7 +230,7 @@ public class WorldEditPlugin extends JavaPlugin {
System.arraycopy(args, 0, split, 1, args.length);
split[0] = "/" + cmd.getName();
controller.handleCommand(wrapPlayer(player), split);
controller.handleCommand(wrapCommandSender(sender), split);
return true;
}