From 03dcca451cf99ef488730b36490cc5041e260388 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Fri, 27 Feb 2015 21:28:16 +1100
Subject: [PATCH] Minor bug fixes

---
 PlotSquared/pom.xml                           |  2 +-
 .../plot/generator/HybridGen.java             |  3 +++
 .../plot/generator/HybridPop.java             | 24 +++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index 57f9da66d..2ceca78fd 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -8,7 +8,7 @@
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
     <artifactId>PlotSquared</artifactId>
-    <version>2.8</version>
+    <version>2.8.1</version>
     <name>PlotSquared</name>
     <packaging>jar</packaging>
     <build>
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
index 96a0a4036..0fe2de4f3 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
@@ -223,6 +223,9 @@ public class HybridGen extends PlotGenerator {
      */
     @Override
     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);
     }
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java
index 641d9c8af..5ff5d73f8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java
@@ -149,10 +149,12 @@ public class HybridPop extends BlockPopulator {
                                     setBlock(w, x, (short) (this.plotheight + y), z, blocks.get(y));
                                 }
                             }
-                            HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
-                            if (states != null) {
-                                for (PlotItem items : states) {
-                                    BlockManager.manager.addItems(this.plotworld.worldname, items);
+                            if (this.plotworld.G_SCH_STATE != null) {
+                                HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
+                                if (states != null) {
+                                    for (PlotItem items : states) {
+                                        BlockManager.manager.addItems(this.plotworld.worldname, items);
+                                    }
                                 }
                             }
                         }
@@ -204,12 +206,14 @@ public class HybridPop extends BlockPopulator {
                                 setBlock(w, x, (short) (this.plotheight + y), z, blocks.get(y));
                             }
                         }
-                        HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
-                        if (states != null) {
-                            for (PlotItem items : states) {
-                                items.x = this.X + x;
-                                items.z = this.Z + z;
-                                BlockManager.manager.addItems(this.plotworld.worldname, items);
+                        if (this.plotworld.G_SCH_STATE != null) {
+                            HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
+                            if (states != null) {
+                                for (PlotItem items : states) {
+                                    items.x = this.X + x;
+                                    items.z = this.Z + z;
+                                    BlockManager.manager.addItems(this.plotworld.worldname, items);
+                                }
                             }
                         }
                     }