EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Allow specifying area for move command

Browse Source
This commit is contained in:
Jesse Boyd 2018-07-05 19:33:17 +10:00
parent 79e1ea9a8f
commit 18c92bea38
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/main/java/com/intellectualcrafters/plot/commands/Move.java
View File

@ -1,8 +1,10 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.Permissions;
@ -35,7 +37,10 @@ public class Move extends SubCommand {
} }
Plot plot2 = MainUtil.getPlotFromString(player, args[0], true); Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
if (plot2 == null) { if (plot2 == null) {
return false; PlotArea area = PS.get().getPlotAreaByString(args[0]);
if (area == null)
return false;
plot2 = area.getPlotAbs(plot1.getId());
} }
if (plot1.equals(plot2)) { if (plot1.equals(plot2)) {
MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID); MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);