Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 12:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/mapping

Browse Source 
Conflicts:
	src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
This commit is contained in:
sk89q
2014-07-06 21:06:10 -07:00
parent d3aa6c86a8 d74237b15e
commit 65f451279c
22 changed files with 409 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
View File

@ -20,7 +20,6 @@
package com.sk89q.worldedit.command;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandAlias;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
@ -706,7 +705,7 @@ public class SelectionCommands {
}
@Command(
aliases = { "/sel", ";" },
aliases = { "/sel", ";", "/desel", "/deselect" },
usage = "[cuboid|extend|poly|ellipsoid|sphere|cyl|convex]",
desc = "Choose a region selector",
min = 0,
@ -761,9 +760,4 @@ public class SelectionCommands {
session.dispatchCUISelection(player);
}
@Command(aliases = {"/desel", "/deselect"}, desc = "Deselect the current selection")
@CommandAlias("/sel")
public void deselect() {
}
}