From c408a8273084b7a578a0946d49c7202451b0fe54 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Sat, 28 Feb 2015 12:06:48 +1100
Subject: [PATCH] Fixed spawn eggs if natural spawning is disabled

---
 .../com/intellectualcrafters/plot/generator/HybridGen.java    | 4 +++-
 .../plot/generator/SquarePlotManager.java                     | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

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 0fe2de4f3..8a2c4fb8f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
@@ -200,7 +200,9 @@ public class HybridGen extends PlotGenerator {
     public List<BlockPopulator> getPopulators(final World world) {
         // disabling spawning for this world
         if (!this.plotworld.MOB_SPAWNING) {
-            world.setSpawnFlags(false, false);
+            if (!this.plotworld.SPAWN_EGGS) {
+                world.setSpawnFlags(false, false);
+            }
             world.setAmbientSpawnLimit(0);
             world.setAnimalSpawnLimit(0);
             world.setMonsterSpawnLimit(0);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
index b076e505f..7a6ffbc03 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
@@ -43,7 +43,6 @@ public abstract class SquarePlotManager extends GridPlotManager {
         final int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
         int idx;
         int idz;
-        
         if (x < 0) {
             idx = (x/size);
             x = size + (x % size);
@@ -86,7 +85,6 @@ public abstract class SquarePlotManager extends GridPlotManager {
         int dz;
         int rx;
         int rz;
-        
         if (x < 0) {
             dx = (x/size);
             rx = size + (x % size);