mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-22 13:16:45 +01:00
Nice code to handle schematic loading and remove the ability to debugroadregen a specific chunk, as it uses a completely different method to actual road generation.
This commit is contained in:
parent
5bdc5a0fcc
commit
8cb2bdc846
@ -20,24 +20,7 @@ public class DebugRoadRegen extends SubCommand {
|
||||
}
|
||||
Plot plot = player.getCurrentPlot();
|
||||
if (plot == null) {
|
||||
ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
|
||||
int extend = 0;
|
||||
if (args.length == 1) {
|
||||
if (MathMan.isInteger(args[0])) {
|
||||
try {
|
||||
extend = Integer.parseInt(args[0]);
|
||||
} catch (NumberFormatException ignored) {
|
||||
C.NOT_VALID_NUMBER.send(player, "(0, <EXTEND HEIGHT>)");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
boolean result = HybridUtils.manager.regenerateRoad(plotArea, chunk, extend);
|
||||
MainUtil.sendMessage(player,
|
||||
"&6Regenerating chunk: " + chunk.x + ',' + chunk.z + "\n&6 - Result: " + (result ?
|
||||
"&aSuccess" :
|
||||
"&cFailed"));
|
||||
MainUtil.sendMessage(player, "&cTo regenerate all roads: /plot regenallroads");
|
||||
C.NOT_IN_PLOT.send(player);
|
||||
} else {
|
||||
HybridPlotManager manager = (HybridPlotManager) plotArea.getPlotManager();
|
||||
manager.createRoadEast(plotArea, plot);
|
||||
|
@ -291,15 +291,9 @@ public abstract class SchematicHandler {
|
||||
}
|
||||
try {
|
||||
ClipboardFormat format = ClipboardFormats.findByFile(file);
|
||||
if (format == BuiltInClipboardFormat.SPONGE_SCHEMATIC) {
|
||||
SpongeSchematicReader ssr = new SpongeSchematicReader(
|
||||
new NBTInputStream(new GZIPInputStream(new FileInputStream(file))));
|
||||
BlockArrayClipboard clip = (BlockArrayClipboard) ssr.read();
|
||||
return new Schematic(clip);
|
||||
} else if (format == BuiltInClipboardFormat.MCEDIT_SCHEMATIC) {
|
||||
MCEditSchematicReader msr = new MCEditSchematicReader(
|
||||
new NBTInputStream(new GZIPInputStream(new FileInputStream(file))));
|
||||
BlockArrayClipboard clip = (BlockArrayClipboard) msr.read();
|
||||
if (format != null) {
|
||||
ClipboardReader reader = format.getReader(new FileInputStream(file));
|
||||
BlockArrayClipboard clip = (BlockArrayClipboard) reader.read();
|
||||
return new Schematic(clip);
|
||||
} else {
|
||||
throw new UnsupportedFormatException(
|
||||
|
Loading…
Reference in New Issue
Block a user