Upstream merge

Bukkit

@@ -1 +1 @@
-Subproject commit 1227b64c8af479322a440de24431c7dc057c9655
+Subproject commit ce94a3555c6925ec301e95cd58f51b7164a651d9

Bukkit-Patches/0004-Enchanced-Timings.patch

@@ -1,4 +1,4 @@
-From 91d36c0322fccafa061f0375eaed02cda0a19447 Mon Sep 17 00:00:00 2001
+From a5a929cfee543a7e70b46c81e2ff3a18447012c1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 11:17:05 +1000
 Subject: [PATCH] Enchanced Timings
@@ -166,10 +166,10 @@ index e09234c..ab2c65e 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index ea30d83..d905435 100644
+index 57681dc..075695c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -430,7 +430,7 @@ public class JavaPluginLoader implements PluginLoader {
+@@ -323,7 +323,7 @@ public final class JavaPluginLoader implements PluginLoader {
                      }
                  }
              };

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

@@ -1,14 +1,14 @@
-From 9f356ddcc7487abf849f336e32efe87d3505f4c7 Mon Sep 17 00:00:00 2001
+From 9fa22f91e7a72a105765b2a1b512d7c199b03980 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 c2f488a..9283b23 100644
+index d178ad0..8dafd02 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -330,4 +330,18 @@ public class SimpleCommandMap implements CommandMap {
+@@ -332,4 +332,18 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }

CraftBukkit

@@ -1 +1 @@
-Subproject commit bafd45061f6e0f7a140defbfaec9850df04fde66
+Subproject commit 169af45bbec1a3b84f1ca8b3a944f4b1f429a68e

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 9d40d84ac4866fa3ee8c9d2549adb1a1f2bd6419 Mon Sep 17 00:00:00 2001
+From 8c02318a4530387c90f7598946c11aff46598f38 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
@@ -142,10 +142,10 @@ index 2f06c8e..bec994f 100644
            <execution>
              <phase>package</phase>
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2653710..61455c8 100644
+index f3e5200..596bfcf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -224,7 +224,7 @@ public final class CraftServer implements Server {
+@@ -226,7 +226,7 @@ public final class CraftServer implements Server {
          loadIcon();
  
          updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));

CraftBukkit-Patches/0004-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From ebc53eba3d6c1be63644e431ca2c7f61c213cb8a Mon Sep 17 00:00:00 2001
+From e97da5da5fb74f5212a6075c94adf147c31824ab Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -54,10 +54,10 @@ index f850a0f..cd529ec 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61455c8..244c727 100644
+index 596bfcf..fc5d8a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -230,8 +230,10 @@ public final class CraftServer implements Server {
+@@ -232,8 +232,10 @@ public final class CraftServer implements Server {
          updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
          updater.check(serverVersion);
  
@@ -70,7 +70,7 @@ index 61455c8..244c727 100644
      }
  
      private File getConfigFile() {
-@@ -581,6 +583,7 @@ public final class CraftServer implements Server {
+@@ -583,6 +585,7 @@ public final class CraftServer implements Server {
          playerList.getIPBans().load();
          playerList.getNameBans().load();
  
@@ -78,7 +78,7 @@ index 61455c8..244c727 100644
          for (WorldServer world : console.worlds) {
              world.difficulty = difficulty;
              world.setSpawnFlags(monsters, animals);
-@@ -595,11 +598,13 @@ public final class CraftServer implements Server {
+@@ -597,11 +600,13 @@ public final class CraftServer implements Server {
              } else {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }

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

@@ -1,11 +1,11 @@
-From d9860352fadbcf7ba9dc05acdfa6f57bbb3fe2e7 Mon Sep 17 00:00:00 2001
+From b8be62f188026035f7ec74efda2cd18f69c9be63 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 95b4704..3bcca91 100644
+index bc3dd41..10efeef 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -40,6 +40,7 @@ public class Chunk {
@@ -16,7 +16,7 @@ index 95b4704..3bcca91 100644
  
      public Chunk(World world, int i, int j) {
          this.sections = new ChunkSection[16];
-@@ -601,6 +602,22 @@ public class Chunk {
+@@ -612,6 +613,22 @@ public class Chunk {
          entity.aj = k;
          entity.ak = this.locZ;
          this.entitySlices[k].add(entity);
@@ -39,7 +39,7 @@ index 95b4704..3bcca91 100644
      }
  
      public void b(Entity entity) {
-@@ -617,6 +634,22 @@ public class Chunk {
+@@ -628,6 +645,22 @@ public class Chunk {
          }
  
          this.entitySlices[i].remove(entity);

CraftBukkit-Patches/0027-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From ee8de91603d37f6cfb9df50c1bdc025ed8aac3d3 Mon Sep 17 00:00:00 2001
+From 72da0a33d19eac6c86adf79d69428a19cb6e17a3 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
@@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
      public static synchronized RegionFile a(File file1, int i, int j) {
          File file2 = new File(file1, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 244c727..0ab3255 100644
+index fc5d8a6..83b0da0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,6 +41,8 @@ import net.minecraft.server.MinecraftServer;
@@ -30,7 +30,7 @@ index 244c727..0ab3255 100644
  import net.minecraft.server.ServerNBTManager;
  import net.minecraft.server.WorldLoaderServer;
  import net.minecraft.server.WorldManager;
-@@ -849,6 +851,30 @@ public final class CraftServer implements Server {
+@@ -851,6 +853,30 @@ public final class CraftServer implements Server {
          worlds.remove(world.getName().toLowerCase());
          console.worlds.remove(console.worlds.indexOf(handle));
  

CraftBukkit-Patches/0035-Do-Not-Search-for-Offline-Players.patch

@@ -1,4 +1,4 @@
-From 38a7193d5cb9b6765a6ba793c7c6eb49c20b20a6 Mon Sep 17 00:00:00 2001
+From ba3c0beaf5b82f2233149ae220d6be4b12856a5d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 16 Jun 2013 08:20:26 +1000
 Subject: [PATCH] Do Not Search for Offline Players
@@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
 By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ab3255..6a38465 100644
+index 83b0da0..b60ca66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1133,7 +1133,7 @@ public final class CraftServer implements Server {
+@@ -1135,7 +1135,7 @@ public final class CraftServer implements Server {
      }
  
      public OfflinePlayer getOfflinePlayer(String name) {

CraftBukkit-Patches/0037-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,14 +1,14 @@
-From 70929539b9364e87555da91424d189d0e70949d2 Mon Sep 17 00:00:00 2001
+From 8db8936f36c119edbf0ed957948978d6b4a8e4aa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6a38465..0633516 100644
+index b60ca66..4f03183 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1398,6 +1398,13 @@ public final class CraftServer implements Server {
+@@ -1400,6 +1400,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {

CraftBukkit-Patches/0038-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 10a0e39c13eff0e451cd4d144037078a6851c783 Mon Sep 17 00:00:00 2001
+From eb8c380d237d918ed3cf4315a6b3246ac353521c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -45,10 +45,10 @@ index 1725bba..5174602 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4d77259..5cd6f7d 100644
+index 4f03183..0ac8f52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -547,11 +547,7 @@ public final class CraftServer implements Server {
+@@ -549,11 +549,7 @@ public final class CraftServer implements Server {
              return true;
          }
  

CraftBukkit-Patches/0039-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,14 +1,14 @@
-From 2155a9e89454ee4120c716bcdc3b744e243ec84b Mon Sep 17 00:00:00 2001
+From 36cb297c394d629e8be30555a40d919481919e6e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3bcca91..efe7ca5 100644
+index 10efeef..2fd6a43 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -895,7 +895,7 @@ public class Chunk {
+@@ -906,7 +906,7 @@ public class Chunk {
          }
  
          this.m = true;

CraftBukkit-Patches/0041-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From 9040fcec49683449480a882231b846a099491a1f Mon Sep 17 00:00:00 2001
+From 6dabb52490ee3e398dd05a60d5fb9579290babf8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index efe7ca5..a4adc56 100644
+index 2fd6a43..4473e7e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -749,6 +749,15 @@ public class Chunk {
+@@ -760,6 +760,15 @@ public class Chunk {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -25,7 +25,7 @@ index efe7ca5..a4adc56 100644
  
              this.world.a(tileentity);
          }
-@@ -758,6 +767,15 @@ public class Chunk {
+@@ -769,6 +778,15 @@ public class Chunk {
              java.util.Iterator<Object> iter = this.entitySlices[i].iterator();
              while (iter.hasNext()) {
                  Entity entity = (Entity) iter.next();

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

@@ -1,14 +1,14 @@
-From a6bce00ef49f371e22716ebe132a85289598d553 Mon Sep 17 00:00:00 2001
+From e1b8633ae7f455bd99b94f38526b671e3795f060 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a4adc56..d458dbb 100644
+index 4473e7e..51ebb7e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -919,7 +919,15 @@ public class Chunk {
+@@ -930,7 +930,15 @@ public class Chunk {
      }
  
      public boolean k() {

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

@@ -1,4 +1,4 @@
-From fc1e8ad76e7fbded89c1277ef6d5a3c21a4583e7 Mon Sep 17 00:00:00 2001
+From ef1c785158ebcb31690699805174834ec2186f6a 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,10 +32,10 @@ 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 716cb15..07fcf38 100644
+index 0ac8f52..fb346f6 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 {
+@@ -548,6 +548,12 @@ public final class CraftServer implements Server {
          if (commandMap.dispatch(sender, commandLine)) {
              return true;
          }
@@ -48,7 +48,7 @@ index 716cb15..07fcf38 100644
  
          sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
  
-@@ -1401,15 +1407,23 @@ public final class CraftServer implements Server {
+@@ -1403,15 +1409,23 @@ public final class CraftServer implements Server {
          }
          // Spigot End
  
@@ -314,5 +314,5 @@ index 0000000..a6c76cc
 +    }
 +}
 -- 
-1.8.4.msysgit.0
+1.8.3.2