Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 11:55:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix plotworld get

Browse Source
This commit is contained in:
Jesse Boyd 2016-04-26 09:32:16 +10:00
parent 8c56affb2f
commit d8849f718c
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
View File

@ -40,6 +40,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
private boolean loaded = false; private boolean loaded = false;
public BukkitPlotGenerator(IndependentPlotGenerator generator) { public BukkitPlotGenerator(IndependentPlotGenerator generator) {
if (generator == null) {
throw new IllegalArgumentException("Generator may not be null!");
}
this.plotGenerator = generator; this.plotGenerator = generator;
this.platformGenerator = this; this.platformGenerator = this;
this.populators.add(new BlockPopulator() { this.populators.add(new BlockPopulator() {
@ -279,7 +282,12 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
return; return;
} }
PlotArea area = PS.get().getPlotArea(world.getName(), null); PlotArea area = PS.get().getPlotArea(world.getName(), null);
this.plotGenerator.generateChunk(this.chunkSetter, area, this.random); try {
this.plotGenerator.generateChunk(this.chunkSetter, area, this.random);
} catch (Throwable e) {
// Recover from generator error
e.printStackTrace();
}
ChunkManager.postProcessChunk(result); ChunkManager.postProcessChunk(result);
} }

13
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -482,15 +482,18 @@ public class PS {
public PlotArea getPlotArea(String world, String id) { public PlotArea getPlotArea(String world, String id) {
PlotArea[] areas = this.plotAreaMap.get(world); PlotArea[] areas = this.plotAreaMap.get(world);
if (areas == null || id == null) { if (areas == null) {
return null; return null;
} }
if (areas.length == 1) { if (areas.length == 1) {
return areas[0]; return areas[0];
} } else if (id == null) {
for (PlotArea area : areas) { return null;
if (StringMan.isEqual(id, area.id)) { } else {
return area; for (PlotArea area : areas) {
if (StringMan.isEqual(id, area.id)) {
return area;
}
} }
} }
return null; return null;