EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Minor tweaks

Browse Source 
- SBQ unsanitized input
- plotme conversion tweaks
- schematic default output directory
- increment version number
This commit is contained in:
boy0001
2015-08-30 16:19:35 +10:00
parent 3662b05da8
commit 0ba838b16b
8 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/config/Settings.java
View File

@@ -120,7 +120,7 @@ public class Settings {
/**
* Schematic Save Path
*/
public static String SCHEMATIC_SAVE_PATH = "/var/www/schematics";
public static String SCHEMATIC_SAVE_PATH = "plugins/PlotSquared/schematics";
/**
* BO3 Save Path
*/

16
src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
View File

@@ -49,7 +49,7 @@ public class SetBlockQueue {
init();
runnables.add(whenDone);
}
if (blocks == null || blocks.size() == 0) {
if (blocks == null || blocks.size() == 0 || !blocks.entrySet().iterator().hasNext()) {
ArrayDeque<Runnable> tasks = runnables;
lastInt = -1;
lastBlock = null;
@@ -81,7 +81,6 @@ public class SetBlockQueue {
@Override
public void run() {
if (locked) {
System.out.print("LOCKED!");
return;
}
if (blocks == null || blocks.size() == 0) {
@@ -205,7 +204,10 @@ public class SetBlockQueue {
result = new PlotBlock[16][];
blocks.put(wrap, result);
}
if ((y > 255) || (y < 0)) {
locked = false;
return;
}
if (result[y >> 4] == null) {
result[y >> 4] = new PlotBlock[4096];
}
@@ -232,6 +234,10 @@ public class SetBlockQueue {
result = new PlotBlock[16][];
blocks.put(wrap, result);
}
if ((y > 255) || (y < 0)) {
locked = false;
return;
}
if (result[y >> 4] == null) {
result[y >> 4] = new PlotBlock[4096];
}
@@ -258,6 +264,10 @@ public class SetBlockQueue {
result = new PlotBlock[16][];
blocks.put(wrap, result);
}
if ((y > 255) || (y < 0)) {
locked = false;
return;
}
if (result[y >> 4] == null) {
result[y >> 4] = new PlotBlock[4096];
}