Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-26 17:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes.

Browse Source
This commit is contained in:
boy0001 2014-10-25 16:40:21 +11:00
parent ed3003a2f6
commit 33acc95d92
1 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java
View File

@ -143,6 +143,7 @@ public class Schematic extends SubCommand {
public void run() { public void run() {
if (counter>=plots.length) { if (counter>=plots.length) {
PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &aFinished!"); PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &aFinished!");
running = false;
Bukkit.getScheduler().cancelTask(task); Bukkit.getScheduler().cancelTask(task);
return; return;
} }
@ -178,8 +179,12 @@ public class Schematic extends SubCommand {
PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save"); PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
return false; return false;
} }
final PlotId i; if (running) {
PlayerFunctions.sendMessage(plr, "&cTask is already running.");
return false;
}
final String world; final String world;
final Plot p2;
if (plr!=null) { if (plr!=null) {
if(!PlayerFunctions.isInPlot(plr)) { if(!PlayerFunctions.isInPlot(plr)) {
sendMessage(plr, C.NOT_IN_PLOT); sendMessage(plr, C.NOT_IN_PLOT);
@ -190,7 +195,7 @@ public class Schematic extends SubCommand {
sendMessage(plr, C.NO_PLOT_PERMS); sendMessage(plr, C.NO_PLOT_PERMS);
return false; return false;
} }
i = myplot.id; p2 = myplot;
world = plr.getWorld().getName(); world = plr.getWorld().getName();
} }
else { else {
@ -198,12 +203,12 @@ public class Schematic extends SubCommand {
try { try {
world = args[0]; world = args[0];
String[] split = args[2].split(";"); String[] split = args[2].split(";");
i = new PlotId(Integer.parseInt(split[0]),Integer.parseInt(split[1])); PlotId i = new PlotId(Integer.parseInt(split[0]),Integer.parseInt(split[1]));
if (PlotMain.getPlots(world)==null || PlotMain.getPlots(world).get(i) == null) { if (PlotMain.getPlots(world)==null || PlotMain.getPlots(world).get(i) == null) {
PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
return false; return false;
} }
p2 = PlotMain.getPlots(world).get(i);
} }
catch (Exception e) { catch (Exception e) {
PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
@ -216,25 +221,47 @@ public class Schematic extends SubCommand {
} }
} }
final Plugin plugin2 = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
@Override this.plots = new Plot[] {p2} ;
public void run() { this.running = true;
CompoundTag schematic = SchematicHandler.getCompoundTag(Bukkit.getWorld(world), i); this.counter = 0;
if (schematic==null) {
PlayerFunctions.sendMessage(plr, "&cInvalid plot"); task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin2, new Runnable() {
return; @Override
} public void run() {
boolean result = SchematicHandler.save(schematic, Settings.Web.PATH+"/"+i.x+","+i.y+","+world+".schematic"); if (counter>=plots.length) {
PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &aFinished!");
if (!result) { running = false;
PlayerFunctions.sendMessage(plr, "&cFailed to save schematic"); Bukkit.getScheduler().cancelTask(task);
return; return;
} }
PlayerFunctions.sendMessage(plr, "&aSuccessfully saved schematic!"); final Plot plot = plots[counter];
} final CompoundTag sch = SchematicHandler.getCompoundTag(Bukkit.getWorld(world), plot.id);
}); if (sch==null) {
PlayerFunctions.sendMessage(plr, "&7 - Skipped plot &c"+plot.id);
}
else {
Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
@Override
public void run() {
counter++;
PlayerFunctions.sendMessage(plr, "&6ID: "+plot.id);
boolean result = SchematicHandler.save(sch, Settings.Web.PATH+"/"+plot.id.x+","+plot.id.y+","+worldname+".schematic");
if (!result) {
PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c"+plot.id);
}
else {
PlayerFunctions.sendMessage(plr, "&7 - &aExport success: "+plot.id);
}
}
});
}
counter++;
}
}, 20, 60);
break; break;
default: default:
sendMessage(plr, C.SCHEMATIC_MISSING_ARG); sendMessage(plr, C.SCHEMATIC_MISSING_ARG);