Upstream Merge

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

CraftBukkit-Patches/0019-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From 038cd29b823c4fdf31ec4113960ae56fcd895bc7 Mon Sep 17 00:00:00 2001
+From 774f4afb154aafc002d1bd87843b2cafafeea32f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -135,7 +135,7 @@ index 9812538..ecf13aa 100644
                                                                      continue label110;
                                                                  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index f74fc9b..f0becc1 100644
+index bab9d8f..9f95452 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -154,4 +154,11 @@ public class SpigotWorldConfig
@@ -151,4 +151,5 @@ index f74fc9b..f0becc1 100644
 +    }
  }
 -- 
-1.8.1.msysgit.1
+1.8.1.2
+