Upstream merge

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0012-View-Distance.patch

@@ -1,4 +1,4 @@
-From f32fdf0a346328efdfa057b39d0e7503dd0d1713 Mon Sep 17 00:00:00 2001
+From e58171001d40f747655e603fd0fdc2701be5e465 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
@@ -22,10 +22,10 @@ index ae53635..cc1b095 100644
  
      public WorldServer a() {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 01d7105..0192dc5 100644
+index 9b5b370..3d938d8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -55,7 +55,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -55,7 +55,7 @@ public class WorldServer extends World {
          // CraftBukkit end
          this.server = minecraftserver;
          this.tracker = new EntityTracker(this);
@@ -51,5 +51,5 @@ index 1545a61..6cc3a91 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1