TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-08 13:33:11 +00:00
Code Issues Projects Releases Wiki Activity

commit

Browse source
This commit is contained in:
boy0001 2015-07-27 23:10:14 +10:00
parent dce25ba07a
commit a39ec22c8c
87 changed files with 785 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View file

@ -26,7 +26,7 @@ import java.util.UUID;
import com.intellectualsites.commands.Argument;
import com.intellectualsites.commands.CommandDeclaration;
import com.intellectualsites.commands.CommandCaller;
import com.intellectualcrafters.plot.object.PlotPlayer;
import org.apache.commons.lang.StringUtils;
@ -51,7 +51,7 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
permission = "plots.merge",
usage = "/plot merge [direction]",
category = CommandCategory.ACTIONS,
requiredType = PlotPlayer.class
requiredType = RequiredType.PLAYER
)
public class Merge extends SubCommand {
public final static String[] values = new String[] { "north", "east", "south", "west" };
@ -86,8 +86,8 @@ public class Merge extends SubCommand {
}
@Override
public boolean onCommand(final CommandCaller caller, final String[] args) {
final PlotPlayer plr = (PlotPlayer) caller.getSuperCaller();
public boolean onCommand(final PlotPlayer plr, final String[] args) {
final Location loc = plr.getLocationFull();
final Plot plot = MainUtil.getPlot(loc);
if (plot == null) {