Merge the two spawn calculation fixes

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

CraftBukkit-Patches/0024-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From a8d2f288d11999d0de83c613c73e5455ea3156c7 Mon Sep 17 00:00:00 2001
+From 21f77e26c9c80277b474d950860e63a27b0fd8f1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
@@ -142,12 +142,12 @@ index 0000000..a5c4549
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 8711c7a..6e8bae8 100644
+index b5f3532..89b2927 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -114,4 +114,15 @@ public class SpigotConfig
      {
-         preventProxies = getBoolean( "settings.prevent-proxies", preventProxies );
+         preventProxies = getBoolean( "settings.prevent-proxies", false );
      }
 +
 +    public static int timeoutTime = 60;