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

Minor bug fixes

Browse Source
This commit is contained in:
boy0001 2015-02-27 21:28:16 +11:00
parent 267956ad3c
commit 03dcca451c
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/pom.xml
View File

@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<artifactId>PlotSquared</artifactId> <artifactId>PlotSquared</artifactId>
<version>2.8</version> <version>2.8.1</version>
<name>PlotSquared</name> <name>PlotSquared</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
View File

@ -223,6 +223,9 @@ public class HybridGen extends PlotGenerator {
*/ */
@Override @Override
public Location getFixedSpawnLocation(final World world, final Random random) { public Location getFixedSpawnLocation(final World world, final Random random) {
if (this.plotworld == null) {
return new Location(world, 0, 128, 0);
}
return new Location(world, 0, this.plotworld.ROAD_HEIGHT + 2, 0); return new Location(world, 0, this.plotworld.ROAD_HEIGHT + 2, 0);
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java
View File

@ -149,6 +149,7 @@ public class HybridPop extends BlockPopulator {
setBlock(w, x, (short) (this.plotheight + y), z, blocks.get(y)); setBlock(w, x, (short) (this.plotheight + y), z, blocks.get(y));
} }
} }
if (this.plotworld.G_SCH_STATE != null) {
HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc); HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
if (states != null) { if (states != null) {
for (PlotItem items : states) { for (PlotItem items : states) {
@ -156,6 +157,7 @@ public class HybridPop extends BlockPopulator {
} }
} }
} }
}
} else { } else {
final PlotLoc loc = new PlotLoc((short) (this.X + x), (short) (this.Z + z)); final PlotLoc loc = new PlotLoc((short) (this.X + x), (short) (this.Z + z));
final HashMap<Short, Byte> data = ChunkManager.GENERATE_DATA.get(loc); final HashMap<Short, Byte> data = ChunkManager.GENERATE_DATA.get(loc);
@ -204,6 +206,7 @@ public class HybridPop extends BlockPopulator {
setBlock(w, x, (short) (this.plotheight + y), z, blocks.get(y)); setBlock(w, x, (short) (this.plotheight + y), z, blocks.get(y));
} }
} }
if (this.plotworld.G_SCH_STATE != null) {
HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc); HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
if (states != null) { if (states != null) {
for (PlotItem items : states) { for (PlotItem items : states) {
@ -213,6 +216,7 @@ public class HybridPop extends BlockPopulator {
} }
} }
} }
}
} else { } else {
// wall // wall
if (((absX >= this.pathWidthLower) && (absX <= this.pathWidthUpper) && (absZ >= this.pathWidthLower) && (absZ <= this.pathWidthUpper))) { if (((absX >= this.pathWidthLower) && (absX <= this.pathWidthUpper) && (absZ >= this.pathWidthLower) && (absZ <= this.pathWidthUpper))) {