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

Fix schematic on claim/auto

Browse Source
This commit is contained in:
Jesse Boyd 2016-04-05 11:07:37 +10:00
parent 1f32707ec2
commit fab60a0d53
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java
View File

@ -41,7 +41,9 @@ public class GenChunk extends PlotChunk<Chunk> {
@Override @Override
public void setBiome(int x, int z, int biome) { public void setBiome(int x, int z, int biome) {
this.grid.setBiome(x, z, this.biomes[biome]); if (this.grid != null) {
this.grid.setBiome(x, z, this.biomes[biome]);
}
} }
public void setBiome(int x, int z, Biome biome) { public void setBiome(int x, int z, Biome biome) {

2
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -1301,7 +1301,7 @@ public class Plot {
PlotArea plotworld = getArea(); PlotArea plotworld = getArea();
if (plotworld.SCHEMATIC_ON_CLAIM) { if (plotworld.SCHEMATIC_ON_CLAIM) {
SchematicHandler.Schematic sch; SchematicHandler.Schematic sch;
if (schematic.isEmpty()) { if (schematic == null || schematic.isEmpty()) {
sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE); sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
} else { } else {
sch = SchematicHandler.manager.getSchematic(schematic); sch = SchematicHandler.manager.getSchematic(schematic);

2
Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
View File

@ -705,7 +705,7 @@ public abstract class SchematicHandler {
* @return Map of block location to tag * @return Map of block location to tag
*/ */
public HashMap<BlockLoc, CompoundTag> getTiles() { public HashMap<BlockLoc, CompoundTag> getTiles() {
return this.tiles; return this.tiles == null ? new HashMap<BlockLoc, CompoundTag>() : tiles;
} }
/** /**