Merge the two spawn calculation fixes

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0022-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From 055bea092702d1912c8bd99415f3b1d91046672e Mon Sep 17 00:00:00 2001
+From 59f6244d29ad8a3a8b383267a4fe1749d7b34db4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -462,12 +462,12 @@ index 0000000..93ce20e
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5e1cfa9..31f4c39 100644
+index e807ec8..c567250 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -142,4 +142,15 @@ public class SpigotWorldConfig
-         
-         antiXrayInstance = new AntiXray( this );
+@@ -149,4 +149,15 @@ public class SpigotWorldConfig
+         mobSpawnRange = getByte( "mob-spawn-range", 4 );
+         log( "Mob Spawn Range: " + mobSpawnRange );
      }
 +
 +    public int animalActivationRange = 32;