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

Fix move command

Browse Source
This commit is contained in:
boy0001 2015-04-01 22:14:00 +11:00
parent 6005501320
commit 33256e0ea4
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java
View File

@ -34,6 +34,7 @@ public enum Command {
// (Rating system) (ratings can be stored as the average, and number of // (Rating system) (ratings can be stored as the average, and number of
// ratings) // ratings)
// - /plot rate <number out of 10> // - /plot rate <number out of 10>
MOVE("move", ""),
FLAG("flag", "f"), FLAG("flag", "f"),
TARGET("target"), TARGET("target"),
CLUSTER("cluster", "clusters"), CLUSTER("cluster", "clusters"),

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Move.java
View File

@ -21,6 +21,7 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PlotSquared;
import com.intellectualcrafters.plot.commands.SubCommand.CommandCategory;
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;
@ -37,7 +38,7 @@ import com.intellectualcrafters.plot.util.Permissions;
*/ */
public class Move extends SubCommand { public class Move extends SubCommand {
public Move() { public Move() {
super("debugmove", "plots.move", "Move a plot", "move", "", CommandCategory.ACTIONS, true); super(Command.MOVE, "Move a plot", "debugmove", CommandCategory.ACTIONS, true);
} }
@Override @Override
@ -77,6 +78,9 @@ public class Move extends SubCommand {
world2 = world; world2 = world;
} }
Plot plot2 = MainUtil.getPlot(world2, plot2id); Plot plot2 = MainUtil.getPlot(world2, plot2id);
System.out.print(plot1 + " | " + plot2);
if (plot1.equals(plot2)) { if (plot1.equals(plot2)) {
MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID); MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot move <X;Z>"); MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot move <X;Z>");

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -859,7 +859,7 @@ public class MainUtil {
public static boolean move(final Plot plot1, final Plot plot2, final Runnable whenDone) { public static boolean move(final Plot plot1, final Plot plot2, final Runnable whenDone) {
final com.intellectualcrafters.plot.object.Location bot1 = MainUtil.getPlotBottomLoc(plot1.world, plot1.id); final com.intellectualcrafters.plot.object.Location bot1 = MainUtil.getPlotBottomLoc(plot1.world, plot1.id);
final com.intellectualcrafters.plot.object.Location bot2 = MainUtil.getPlotBottomLoc(plot1.world, plot1.id); final com.intellectualcrafters.plot.object.Location bot2 = MainUtil.getPlotBottomLoc(plot2.world, plot1.id);
final Location top = MainUtil.getPlotTopLoc(plot1.world, plot1.id); final Location top = MainUtil.getPlotTopLoc(plot1.world, plot1.id);
if (plot1.owner == null) { if (plot1.owner == null) {
TaskManager.runTaskLater(whenDone, 1); TaskManager.runTaskLater(whenDone, 1);
@ -883,6 +883,9 @@ public class MainUtil {
plot.id.y += offset_y; plot.id.y += offset_y;
PlotSquared.getPlots(plot2.world).put(plot.id, plot); PlotSquared.getPlots(plot2.world).put(plot.id, plot);
} }
System.out.print("BOT: " + bot1);
System.out.print("TOP: " + top);
System.out.print(" -> " + bot2);
ChunkManager.manager.copyRegion(bot1, top, bot2, new Runnable() { ChunkManager.manager.copyRegion(bot1, top, bot2, new Runnable() {
@Override @Override
public void run() { public void run() {