Upstream merge

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

Bukkit

@@ -1 +1 @@
-Subproject commit ad1f1c2c75f4e5e7ffded02ab4a3c117a8f6f957
+Subproject commit 80a81d2605fad9113a648523420a62afd5996a4d

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 654a9071d73b6cf7a30503340743cb1481b185b5 Mon Sep 17 00:00:00 2001
+From e1577d7f4aa7a223ab9203f5adf601402694f23d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a83e578..e1f4e61 100644
+index 2a947f6..0bc95a2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index a83e578..e1f4e61 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.7.2-R0.1-SNAPSHOT</version>
+     <version>1.7.2-R0.2-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>

Bukkit-Patches/0002-Measure-Timings-Duration.patch

@@ -1,11 +1,11 @@
-From f20ab58bf8d3bcf2d7fe5e8275d3127874bbd61a Mon Sep 17 00:00:00 2001
+From 33cf8909fd2af5abf1f2a64b7bc3ff1ecdc9e9b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Measure Timings Duration
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
-index 29ebbe0..3c4ef89 100644
+index 05cfcb0..c2874f1 100644
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList;
@@ -37,10 +37,10 @@ index 29ebbe0..3c4ef89 100644
                  if (separate) sender.sendMessage("Names written to " + names.getPath());
              } catch (IOException e) {
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 93fb4f5..a96a33b 100644
+index 3c9611b..2c4b03b 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -274,6 +274,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -275,6 +275,7 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -49,5 +49,5 @@ index 93fb4f5..a96a33b 100644
      }
  
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0006-BungeeCord-Support.patch

@@ -1,14 +1,14 @@
-From 90e7f1b07d3998ff3eabc59edb00fe2993b02eb8 Mon Sep 17 00:00:00 2001
+From 912392969b3e727b360b37836a85b2456ad7c991 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3ec374b..cc9c3b2 100644
+index 7aa697d..22bce07 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -721,4 +721,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -788,4 +788,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @see Player#setHealthScaled(boolean)
       */
      public double getHealthScale();
@@ -33,7 +33,7 @@ index 3ec374b..cc9c3b2 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-index 60c0875..dab3c5c 100644
+index b74b7b8..8fb1c98 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 @@ -14,6 +14,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -44,9 +44,9 @@ index 60c0875..dab3c5c 100644
  
      /**
       * @deprecated Address should be provided in other constructor
-@@ -38,10 +39,17 @@ public class PlayerLoginEvent extends PlayerEvent {
-      * @param hostname The hostname that was used to connect to the server
-      * @param address The address the player used to connect, provided for timing issues
+@@ -40,10 +41,17 @@ public class PlayerLoginEvent extends PlayerEvent {
+      * @param address The address the player used to connect, provided for
+      *     timing issues
       */
 -    public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address) {
 +    public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address, final InetAddress realAddress) { // Spigot
@@ -63,7 +63,7 @@ index 60c0875..dab3c5c 100644
      }
  
      /**
-@@ -49,7 +57,7 @@ public class PlayerLoginEvent extends PlayerEvent {
+@@ -52,7 +60,7 @@ public class PlayerLoginEvent extends PlayerEvent {
       */
      @Deprecated
      public PlayerLoginEvent(final Player player, final Result result, final String message) {
@@ -72,7 +72,7 @@ index 60c0875..dab3c5c 100644
      }
  
      /**
-@@ -61,12 +69,23 @@ public class PlayerLoginEvent extends PlayerEvent {
+@@ -65,12 +73,23 @@ public class PlayerLoginEvent extends PlayerEvent {
       * @param result The result status for this event
       * @param message The message to be displayed if result denies login
       */
@@ -99,5 +99,5 @@ index 60c0875..dab3c5c 100644
       * Gets the current result of the login, as an enum
       *
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0008-Add-Particle-API.patch

@@ -1,11 +1,11 @@
-From ae6b528446bfbe1c5c5e8d4301287364f0cc8ddd Mon Sep 17 00:00:00 2001
+From bb9b6439fcc6c3657b5f778b681e39e0f1b9ee34 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
 
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 708bee9..62c7c11 100644
+index 2474a2d..4a4a12d 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -5,6 +5,7 @@ import java.util.Map;
@@ -16,7 +16,7 @@ index 708bee9..62c7c11 100644
  import org.bukkit.potion.Potion;
  
  /**
-@@ -78,27 +79,178 @@ public enum Effect {
+@@ -79,27 +80,178 @@ public enum Effect {
      /**
       * The flames seen on a mobspawner; a visual effect.
       */
@@ -199,7 +199,7 @@ index 708bee9..62c7c11 100644
       * @deprecated Magic value
       */
      @Deprecated
-@@ -107,6 +259,15 @@ public enum Effect {
+@@ -108,6 +260,15 @@ public enum Effect {
      }
  
      /**
@@ -215,16 +215,17 @@ index 708bee9..62c7c11 100644
       * @return The type of the effect.
       */
      public Type getType() {
-@@ -114,7 +275,7 @@ public enum Effect {
+@@ -115,8 +276,7 @@ public enum Effect {
      }
  
      /**
--     * @return The class which represents data for this effect, or null if none
+-     * @return The class which represents data for this effect, or null if
+-     *     none
 +     * @return if this Effect isn't of type PARTICLE it returns the class which represents data for this effect, or null if none
       */
      public Class<?> getData() {
          return this.data;
-@@ -134,12 +295,32 @@ public enum Effect {
+@@ -136,12 +296,32 @@ public enum Effect {
  
      static {
          for (Effect effect : values()) {
@@ -260,10 +261,10 @@ index 708bee9..62c7c11 100644
 +    public enum Type {SOUND, VISUAL, PARTICLE}
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 62fadda..39c72c5 100644
+index f02bfb7..a58eb05 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1070,6 +1070,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1151,6 +1151,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean isGameRule(String rule);
  
@@ -321,10 +322,10 @@ index 62fadda..39c72c5 100644
       * Represents various map environment types that a world may be
       */
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cc9c3b2..8eab616 100644
+index 22bce07..9b4c28f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -736,6 +736,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -803,6 +803,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -354,5 +355,5 @@ index 08aa71d..5217aec 100644
      }
  }
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From f4c3f11329a362ba8a213030895b1cf04fe85f46 Mon Sep 17 00:00:00 2001
+From e4aaa81f0b3679aecf548da2945c84bd4af3b53d Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:01 -0500
 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
 Defines EntitySpawnEvent and SpawnerSpawnEvent. Adds BUKKIT-267 and BUKKIT-1559
 
 diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index 24c4ebf..ed9c4a0 100644
+index 3055ea7..6bde0fe 100644
 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 @@ -4,17 +4,13 @@ import org.bukkit.Location;
@@ -57,8 +57,8 @@ index 24c4ebf..ed9c4a0 100644
 -    /**
       * Gets the type of creature being spawned.
       *
-      * @return A CreatureType value detailing the type of creature being spawned
-@@ -70,15 +49,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
+      * @return A CreatureType value detailing the type of creature being
+@@ -72,15 +51,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
          return spawnReason;
      }
  
@@ -216,5 +216,5 @@ index 0000000..1acb3c4
 +    }
 +}
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -1,14 +1,14 @@
-From 5d672b1aa92376a8e13540221f774f14ff96b2d7 Mon Sep 17 00:00:00 2001
+From 061b904c4d4c86c60283080b60e44d0a7ca68abe Mon Sep 17 00:00:00 2001
 From: Alex Bennett <alex.eugene.bennett@gmail.com>
 Date: Thu, 11 Jul 2013 15:31:32 -0500
 Subject: [PATCH] Added getAllSessionData() to the Conversation API.
 
 
 diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java
-index 7a5b5ed..6b4bcac 100644
+index 4f33ff4..7390a77 100644
 --- a/src/main/java/org/bukkit/conversations/ConversationContext.java
 +++ b/src/main/java/org/bukkit/conversations/ConversationContext.java
-@@ -44,6 +44,14 @@ public class ConversationContext {
+@@ -46,6 +46,14 @@ public class ConversationContext {
      }
  
      /**
@@ -20,9 +20,9 @@ index 7a5b5ed..6b4bcac 100644
 +    }
 +
 +    /**
-      * Gets session data shared between all {@link Prompt} invocations. Use this as a way
-      * to pass data through each Prompt as the conversation develops.
-      *
+      * Gets session data shared between all {@link Prompt} invocations. Use
+      * this as a way to pass data through each Prompt as the conversation
+      * develops.
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch

@@ -1,14 +1,14 @@
-From 8c044d475e5ebdf5ad41667d3db04a03cf4dc33f Mon Sep 17 00:00:00 2001
+From 8c588a47e59db68d802c08d47f9be97bc4c5e09a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 22 Jul 2013 19:09:43 +1000
 Subject: [PATCH] Catch Conversation API Errors
 
 
 diff --git a/src/main/java/org/bukkit/conversations/Conversation.java b/src/main/java/org/bukkit/conversations/Conversation.java
-index a30745f..55c9785 100644
+index d4c1f6d..46912c8 100644
 --- a/src/main/java/org/bukkit/conversations/Conversation.java
 +++ b/src/main/java/org/bukkit/conversations/Conversation.java
-@@ -193,6 +193,7 @@ public class Conversation {
+@@ -209,6 +209,7 @@ public class Conversation {
       * @param input The user's chat text.
       */
      public void acceptInput(String input) {
@@ -16,7 +16,7 @@ index a30745f..55c9785 100644
          if (currentPrompt != null) {
  
              // Echo the user's input
-@@ -212,6 +213,12 @@ public class Conversation {
+@@ -228,6 +229,12 @@ public class Conversation {
              currentPrompt = currentPrompt.acceptInput(context, input);
              outputNextPrompt();
          }
@@ -30,5 +30,5 @@ index a30745f..55c9785 100644
  
      /**
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0015-Player-Collision-API.patch

@@ -1,14 +1,14 @@
-From 64dc76e6adadefc5072c492ca1ebd81e88fa95a9 Mon Sep 17 00:00:00 2001
+From 25627541c2c5d7e0ead8ddeb5ceb54f7fc2f9fd5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8eab616..9ee8f5f 100644
+index 9b4c28f..ba0ce2b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -741,6 +741,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -808,6 +808,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -37,5 +37,5 @@ index 8eab616..9ee8f5f 100644
  
      Spigot spigot();
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch

@@ -1,14 +1,14 @@
-From f8a6577edc2c37aa3bc8cffd9fbf29491488bade Mon Sep 17 00:00:00 2001
+From 09ffec47d3a03dc0b86bcd303bebe6bb837ddd39 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:42:16 +1000
 Subject: [PATCH] Expand Boolean Prompt Values
 
 
 diff --git a/src/main/java/org/bukkit/conversations/BooleanPrompt.java b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
-index 6abb354..a51e754 100644
+index 3f2c97f..81ef78c 100644
 --- a/src/main/java/org/bukkit/conversations/BooleanPrompt.java
 +++ b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
-@@ -14,12 +14,13 @@ public abstract class BooleanPrompt extends ValidatingPrompt{
+@@ -15,12 +15,13 @@ public abstract class BooleanPrompt extends ValidatingPrompt{
  
      @Override
      protected boolean isInputValid(ConversationContext context, String input) {
@@ -24,5 +24,5 @@ index 6abb354..a51e754 100644
      }
  
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,14 +1,14 @@
-From 2b0c15a4f33f6f6f08f59c0245675a45a83ac572 Mon Sep 17 00:00:00 2001
+From a8a099f5f2035ace89be9d9b7dfe4cc7c470a629 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:49:36 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 72af4fa..a5b2100 100644
+index 396ea20..294e80b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -280,4 +280,22 @@ public interface Entity extends Metadatable {
+@@ -291,4 +291,22 @@ public interface Entity extends Metadatable {
       * @return The current vehicle.
       */
      public Entity getVehicle();
@@ -32,5 +32,5 @@ index 72af4fa..a5b2100 100644
 +    // Spigot End
  }
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0018-Add-respawn-API.patch

@@ -1,14 +1,14 @@
-From 7e6fa10b69f0c1aedc0835a504135986d96d3092 Mon Sep 17 00:00:00 2001
+From a693df4f53bb8e5c86a9dc5e67f4387838d266b3 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9ee8f5f..8fd9a07 100644
+index ba0ce2b..15481e7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -762,6 +762,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -829,6 +829,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -24,5 +24,5 @@ index 9ee8f5f..8fd9a07 100644
  
      Spigot spigot();
 -- 
-1.8.1.2
+1.8.3.2
 

Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch

@@ -1,14 +1,14 @@
-From 47c6643184e01fc22dc9eecbca2aec48e2900616 Mon Sep 17 00:00:00 2001
+From b3235471bc185d87ea76910a169501977ec9c578 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 18 Dec 2013 10:19:50 +1100
 Subject: [PATCH] Allow for fallback commands to be removed.
 
 
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index f716782..cb0707f 100644
+index c2f488a..9283b23 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -326,4 +326,18 @@ public class SimpleCommandMap implements CommandMap {
+@@ -330,4 +330,18 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }

CraftBukkit

@@ -1 +1 @@
-Subproject commit 5a2dda293f5b025a0165a67f58b92cba11b4b904
+Subproject commit d791c11a97e761a9f2bdfc9609be83e3922ae0ce

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 1e89a50213c51e7ee007a928876031c590a84e59 Mon Sep 17 00:00:00 2001
+From 1c3e7c82ffcf88db8257648b299b791ad87a697b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 2afdff4..fb6b5c4 100644
+index f81e47a..a4051a1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 2afdff4..fb6b5c4 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.7.2-R0.1-SNAPSHOT</version>
+   <version>1.7.2-R0.2-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,14 +1,14 @@
-From 95f2e5161b4c710aa311b89876e3d5d341768f26 Mon Sep 17 00:00:00 2001
+From cbba21527d0a1db4429922e98e09d0d1a82689ae Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5626e98..5938b37 100644
+index 3d0383d..c16413a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1274,4 +1274,14 @@ public class CraftWorld implements World {
+@@ -1280,4 +1280,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.locX, chunk.locZ);
          }
      }
@@ -64,10 +64,10 @@ index fe0f200..e026c1f 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 48c5ae9..9f09b84 100644
+index 33169e2..83f51ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1126,4 +1126,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1128,4 +1128,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          collection.add(new AttributeModifiable(getHandle().bc(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
      }

CraftBukkit-Patches/0016-Improved-Timings-System.patch

@@ -1,4 +1,4 @@
-From d8e3dd9843d4506465935ccfb39c6c1e9188f600 Mon Sep 17 00:00:00 2001
+From 7afd251cfd6c1348e94d6ee6fbd649dace08c51b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@@ -6,10 +6,10 @@ Subject: [PATCH] Improved Timings System
 Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2f842c3..88853ca 100644
+index 9c99177..b88f75c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -107,6 +107,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -106,6 +106,7 @@ public class ChunkProviderServer implements IChunkProvider {
          // CraftBukkit end
  
          if (chunk == null) {
@@ -17,7 +17,7 @@ index 2f842c3..88853ca 100644
              chunk = this.loadChunk(i, j);
              if (chunk == null) {
                  if (this.chunkProvider == null) {
-@@ -143,6 +144,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -141,6 +142,7 @@ public class ChunkProviderServer implements IChunkProvider {
              }
              // CraftBukkit end
              chunk.a(this, this, i, j);
@@ -26,7 +26,7 @@ index 2f842c3..88853ca 100644
  
          // CraftBukkit start - If we didn't need to load the chunk run the callback now
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fec07f8..0c1350e 100644
+index dc0abc5..3d6aeff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@@ -145,7 +145,7 @@ index ce2aaf4..453e508 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d32bf3f..d34fea7 100644
+index e3bd043..9cab7a9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -914,6 +914,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0049-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 9997f20f4bbd26fc878222eaf6f9060c18c12920 Mon Sep 17 00:00:00 2001
+From 01cc08c693743327d8425587add6ca59ff6fcc17 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -57,10 +57,10 @@ index af08d2f..d910e8a 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cec99a1..2492000 100644
+index ef74879..06b13c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1131,6 +1131,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1133,6 +1133,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {

CraftBukkit-Patches/0053-Cap-Minimum-Player-Speed.patch

@@ -1,14 +1,14 @@
-From 9584169bdf6aa8b3c0d06f042d5306ca49a31a21 Mon Sep 17 00:00:00 2001
+From 6bb008fdb2d32afe9c09041be54fdf42c5869f85 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2492000..627a580 100644
+index 06b13c3..3524bce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1003,7 +1003,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1005,7 +1005,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setFlySpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index 2492000..627a580 100644
          player.updateAbilities();
  
      }
-@@ -1011,7 +1011,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1013,7 +1013,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setWalkSpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();

CraftBukkit-Patches/0059-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From 443c2d3ba804b76d3c18dd0bcac4011e14f755b3 Mon Sep 17 00:00:00 2001
+From 92f128db2aab392e895f99a9be5986a5a403f96e Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 627a580..9569bd4 100644
+index 3524bce..52c75f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1144,6 +1144,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1146,6 +1146,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().l = collides; // First boolean of Entity
          }

CraftBukkit-Patches/0065-Clear-Flower-Pot-on-Drop.patch

@@ -1,4 +1,4 @@
-From e0291e8477c3d29eb8f18324789bf6031175237f Mon Sep 17 00:00:00 2001
+From 9d9ad7d243e38c0a8bde75cc1ea23e41b6e670eb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop

CraftBukkit-Patches/0065-Fix-links-in-chat.patch

@@ -1,104 +0,0 @@
-From 4f9961ad971e3355f5ec6ad1a760f76a355ac299 Mon Sep 17 00:00:00 2001
-From: Thinkofdeath <purggames@gmail.com>
-Date: Sun, 1 Dec 2013 10:33:55 +0000
-Subject: [PATCH] Fix links in chat
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index cc8e715..5607df1 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-@@ -3,11 +3,15 @@ package org.bukkit.craftbukkit.util;
- import java.util.ArrayList;
- import java.util.List;
- import java.util.Map;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
- 
- import net.minecraft.server.ChatComponentText;
- import net.minecraft.server.ChatModifier;
- import net.minecraft.server.EnumChatFormat;
- import net.minecraft.server.IChatBaseComponent;
-+import net.minecraft.server.ChatClickable;
-+import net.minecraft.server.EnumClickAction;
- 
- import com.google.common.collect.ImmutableMap;
- import com.google.common.collect.ImmutableMap.Builder;
-@@ -29,6 +33,8 @@ public final class CraftChatMessage {
-         private ChatModifier modifier = new ChatModifier();
-         private StringBuilder builder = new StringBuilder();
-         private final IChatBaseComponent[] output;
-+        private static final Pattern url = Pattern.compile("^(\u00A7.)*?((?:(https?)://)?([-\\w_\\.]{2,}\\.[a-z]{2,4})(/\\S*?)?)(\u00A7.)*?$");
-+        private int lastWord = 0;
- 
-         private FromString(String message) {
-             if (message == null) {
-@@ -38,10 +44,14 @@ public final class CraftChatMessage {
-             list.add(currentChatComponent);
- 
-             EnumChatFormat format = null;
-+            Matcher matcher = url.matcher(message);
-+            lastWord = 0;
- 
-             for (int i = 0; i < message.length(); i++) {
-                 char currentChar = message.charAt(i);
-                 if (currentChar == '\u00A7' && (i < (message.length() - 1)) && (format = formatMap.get(message.charAt(i + 1))) != null) {
-+                    checkUrl(matcher, message, i);
-+                    lastWord++;
-                     if (builder.length() > 0) {
-                         appendNewComponent();
-                     }
-@@ -73,11 +83,18 @@ public final class CraftChatMessage {
-                     }
-                     i++;
-                 } else if (currentChar == '\n') {
-+                    checkUrl(matcher, message, i);
-+                    lastWord = i + 1;
-                     if (builder.length() > 0) {
-                         appendNewComponent();
-                     }
-                     currentChatComponent = null;
-                 } else {
-+                    if (currentChar == ' ' || i == message.length() - 1) {
-+                        if (checkUrl(matcher, message, i)) {
-+                            break;
-+                        }
-+                    }
-                     builder.append(currentChar);
-                 }
-             }
-@@ -89,6 +106,31 @@ public final class CraftChatMessage {
-             output = list.toArray(new IChatBaseComponent[0]);
-         }
- 
-+        private boolean checkUrl(Matcher matcher, String message, int i) {
-+            Matcher urlMatcher = matcher.region(lastWord, i == message.length() - 1 ? message.length() : i);
-+            lastWord = i + 1;
-+            if (urlMatcher.find()) {
-+                String fullUrl = urlMatcher.group(2);
-+                String protocol = urlMatcher.group(3);
-+                String url = urlMatcher.group(4);
-+                String path = urlMatcher.group(5);
-+                builder.delete(builder.length() - fullUrl.length() + (i == message.length() - 1 ? 1 : 0), builder.length());
-+                if (builder.length() > 0) {
-+                    appendNewComponent();
-+                }
-+                builder.append(fullUrl);
-+                ChatClickable link = new ChatClickable(EnumClickAction.OPEN_URL,
-+                        (protocol!=null?protocol:"http") + "://" + url + (path!=null?path:""));
-+                modifier.a(link);
-+                appendNewComponent();
-+                modifier.a((ChatClickable) null);
-+                if (i == message.length() - 1) {
-+                    return true;
-+                }
-+            }
-+            return false;
-+        }
-+
-         private void appendNewComponent() {
-             IChatBaseComponent addition = new ChatComponentText(builder.toString()).setChatModifier(modifier);
-             builder = new StringBuilder();
--- 
-1.8.3.2
-

CraftBukkit-Patches/0066-Fix-some-chunks-not-being-sent-to-the-client.patch

@@ -1,4 +1,4 @@
-From b3f0aa27d0f07c6b3a558cf68c5248338ddc4ff2 Mon Sep 17 00:00:00 2001
+From 09713737e4c6dcf0100eb9f26cd17084ca17241d Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client

CraftBukkit-Patches/0067-Fix-Broken-Async-Chat.patch

@@ -1,4 +1,4 @@
-From 57a94d39fba4e718dde09e89889c0869d2927870 Mon Sep 17 00:00:00 2001
+From d70115f8cd2d134b29976ff51d65a706f0a70987 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat

CraftBukkit-Patches/0068-Allow-Teleportation-of-Vehicles-and-Passengers.patch

@@ -1,11 +1,11 @@
-From 33647977dac8872095545e0835cda867fa1fadad Mon Sep 17 00:00:00 2001
+From a23c1013b53d3e115cdab33db3fc24a302c0d64c Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Thu, 5 Dec 2013 21:58:11 +0100
 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f870cc6..5635c35 100644
+index 52c75f0..c9454b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -430,9 +430,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

CraftBukkit-Patches/0069-Remove-OS-X-Special-Chars-from-Signs.patch

@@ -1,11 +1,11 @@
-From 1ba7c07ce2746c0bbf748599aed3b6800a50d561 Mon Sep 17 00:00:00 2001
+From f9142cbe339c21f75f232d8aa2515e384d75a5bc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 97f0abd..d7dbc54 100644
+index f2053de..34fcdc2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0070-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 0c34e90fdc674988a33993715d0a2b974f87bea8 Mon Sep 17 00:00:00 2001
+From c977f4ada044f1ded8e76c87842685a5e9ca2e74 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator

CraftBukkit-Patches/0071-Fix-Jungle-Tree-Generation.patch

@@ -1,22 +0,0 @@
-From 51c0917dc84e00dc6d81614b6b6513b6f8a2c1f6 Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Fri, 6 Dec 2013 17:16:32 +1100
-Subject: [PATCH] Fix Jungle Tree Generation
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0f21e89..291c044 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -373,7 +373,7 @@ public class CraftWorld implements World {
-             gen = new WorldGenTaiga1();
-             break;
-         case JUNGLE:
--            gen = new WorldGenMegaTree(true, rand.nextBoolean());
-+            gen = new WorldGenJungleTree(true, 10, 20, 3, 3); // Magic values as in BlockSapling 
-             break;
-         case SMALL_JUNGLE:
-             gen = new WorldGenTrees(true, 4 + rand.nextInt(7), 3, 3, false);
--- 
-1.8.3.2
-

CraftBukkit-Patches/0071-Optimize-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 18db29b0ceb2bc7ed96c080d0debffb12b9aaf0e Mon Sep 17 00:00:00 2001
+From 4a0048bc9fa3f7e07b3e8ec59bdce542d5f6b122 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher

CraftBukkit-Patches/0072-Allow-Disabling-Zombie-Villager-Aggression.patch

@@ -1,4 +1,4 @@
-From b65da1e05d8cdca4cf1b74d132299154adbab3c1 Mon Sep 17 00:00:00 2001
+From 3adae0f79ff46955ce6e1caf525a94c92dde8cc4 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression

CraftBukkit-Patches/0073-Configurable-Amount-of-Netty-Threads.patch

@@ -1,4 +1,4 @@
-From b62bf70604c0bb0a80bb31f64735f6a3c7b427f1 Mon Sep 17 00:00:00 2001
+From 87ecb585f9009d2ab81a48c4c4411db12d78abb8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads

CraftBukkit-Patches/0074-Prevent-Mineshaft-Saving.patch

@@ -1,4 +1,4 @@
-From fafa2b8f9bc9e8f7b010903e245c3b26d220a678 Mon Sep 17 00:00:00 2001
+From a2b9457c769ca326b05f739a2a8b0efa98f217ad Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving

CraftBukkit-Patches/0075-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch

@@ -1,4 +1,4 @@
-From b3011dc8a9d95e3b0f102769229209233c51454d Mon Sep 17 00:00:00 2001
+From 6f8c9264a359086a030be0348390caed19323c18 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 18 Dec 2013 10:32:15 +1100
 Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@@ -32,7 +32,7 @@ index e63f17c..e58be15 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 68c0f4e..2d79deb 100644
+index cfa90d3..f369944 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -546,6 +546,12 @@ public final class CraftServer implements Server {

CraftBukkit-Patches/0076-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From 563e6959f1d86d5fc2fc8da3f88e7d25396c334f Mon Sep 17 00:00:00 2001
+From 95fd9533e07c9c6adf85d46a8bbd527d06f5c366 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode

CraftBukkit-Patches/0077-Log-Cause-of-Unexpected-Exceptions.patch

@@ -1,4 +1,4 @@
-From b98bffa57587d046b1c8fa7d37b81b65663707a7 Mon Sep 17 00:00:00 2001
+From a19a14311abaf6f155946cee826afd88b63c9ac8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions

CraftBukkit-Patches/0077-Remove-references-to-chunklist.patch

@@ -1,40 +0,0 @@
-From b2430eeec08c1b17e83a32f509b045364f20bc11 Mon Sep 17 00:00:00 2001
-From: frymaster <frymaster@12700.org>
-Date: Tue, 17 Dec 2013 15:54:48 +0000
-Subject: [PATCH] Remove references to chunklist
-
-Commit c576054539790bdeb35285f62863d74b48c0782d removed the chunklist collection stored in ChunkProviderServer, however it has been partially restored in some places by 7e1ac0a77129b169704c1e222ff2deb3ab6cd2d2.  As not all references to this were restored, this has caused the chunklist and chunks collections to become out of sync, resulting in a memory leak.
-
-This commit removes chunklist from ChunkProviderServer again. Fixes BUKKIT-5190
-
-diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 88853ca..b88f75c 100644
---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
-+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -30,7 +30,6 @@ public class ChunkProviderServer implements IChunkProvider {
-     private IChunkLoader f;
-     public boolean forceChunkLoad = false; // true -> false
-     public LongObjectHashMap<Chunk> chunks = new LongObjectHashMap<Chunk>();
--    private List chunkList = new ArrayList();
-     public WorldServer world;
-     // CraftBukkit end
- 
-@@ -129,7 +128,6 @@ public class ChunkProviderServer implements IChunkProvider {
-             }
- 
-             this.chunks.put(LongHash.toLong(i, j), chunk); // CraftBukkit
--            this.chunkList.add(chunk);
-             chunk.addEntities();
- 
-             // CraftBukkit start
-@@ -307,7 +305,6 @@ public class ChunkProviderServer implements IChunkProvider {
-                     // this.unloadQueue.remove(olong);
-                     // this.chunks.remove(olong.longValue());
-                     this.chunks.remove(chunkcoordinates); // CraftBukkit
--                    this.chunkList.remove(chunk);
-                 }
-             }
-             // CraftBukkit end
--- 
-1.8.3.2
-