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

getSchematic feedback if selection contains non-existent chunk

Browse Source
This commit is contained in:
boy0001 2015-03-31 21:05:40 +11:00
parent b6d86ec1e1
commit 86a7974f84
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View File

@ -66,6 +66,10 @@ public class SQLManager implements AbstractDB {
private final String prefix; private final String prefix;
// Private Final // Private Final
private Connection connection; private Connection connection;
public Connection getConnection() {
return this.connection;
}
/** /**
* Constructor * Constructor

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
View File

@ -33,7 +33,7 @@ public abstract class ClassicPlotManager extends SquarePlotManager {
} }
return false; return false;
} }
public boolean setFloor(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) { public boolean setFloor(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) {
final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld; final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
final Location pos1 = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid).add(1, 0, 1); final Location pos1 = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid).add(1, 0, 1);

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BukkitSchematicHandler.java
View File

@ -61,12 +61,13 @@ public class BukkitSchematicHandler extends SchematicHandler {
for (j = (pos1.getZ() / 16) * 16; j < (16 + ((pos2.getZ() / 16) * 16)); j += 16) { for (j = (pos1.getZ() / 16) * 16; j < (16 + ((pos2.getZ() / 16) * 16)); j += 16) {
boolean result = ChunkManager.manager.loadChunk(world, new ChunkLoc(i, j)); boolean result = ChunkManager.manager.loadChunk(world, new ChunkLoc(i, j));
if (!result) { if (!result) {
System.out.print("&cIllegal selection. Cannot save non-existent chunk at " + (i / 16) + ", " + (j / 16));
return null; return null;
} }
} }
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&7 - Cannot save: corrupt chunk at " + (i / 16) + ", " + (j / 16)); PlotSquared.log("&cIllegal selection. Cannot save corrupt chunk at " + (i / 16) + ", " + (j / 16));
return null; return null;
} }
final int width = (pos2.getX() - pos1.getX()) + 1; final int width = (pos2.getX() - pos1.getX()) + 1;