Update CraftBukkit

CraftBukkit

@@ -1 +1 @@
-Subproject commit 37c79691615fbd28b49c7371a64700e4f5713eca
+Subproject commit a04b586418538c428d0e464df3e2a1f3b06889fd

CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch

@@ -1,4 +1,4 @@
-From 84cc56d8772b193ef1392b7b802b1e509996adb9 Mon Sep 17 00:00:00 2001
+From 81b0beb9e6bceb7a05a843bbe59ec6e20425bd38 Mon Sep 17 00:00:00 2001
 From: Andrew Krieger <Slizyboy@hotmail.com>
 Date: Tue, 24 Dec 2013 07:55:23 -0800
 Subject: [PATCH] Cross World Entity Teleportation

CraftBukkit-Patches/0146-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch

@@ -1,22 +0,0 @@
-From f1218c01ac825426a172f3332efc98f204d45707 Mon Sep 17 00:00:00 2001
-From: Zach Brown <Zbob750@live.com>
-Date: Tue, 24 Jun 2014 09:51:05 -0500
-Subject: [PATCH] Fix ItemFrame and Fireball EntityDamageByEntityEvent
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c8e3db0..ca201b1 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -597,7 +597,7 @@ public class CraftEventFactory {
-         if (event == null) {
-             return false;
-         }
--        return event.isCancelled() || event.getDamage() == 0;
-+        return event.isCancelled();
-     }
- 
-     public static PlayerLevelChangeEvent callPlayerLevelChangeEvent(Player player, int oldLevel, int newLevel) {
--- 
-1.9.1
-

CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch

@@ -1,4 +1,4 @@
-From 9d0db6f7de036491b343ae39b3aebbb824248818 Mon Sep 17 00:00:00 2001
+From 9bdd9990787595e243785731f966254860a20a3a Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets

CraftBukkit-Patches/0148-Better-item-validation.patch

@@ -1,4 +1,4 @@
-From 596be8ab109b740acdc0441131552d2ffa2046cd Mon Sep 17 00:00:00 2001
+From c09d735f8bf44a0e32ca62cf6179d4acae8461a2 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation

CraftBukkit-Patches/0149-Further-Seed-Customisation.patch

@@ -1,4 +1,4 @@
-From 3f3c4ec60f21c86d747c10a53520497368337835 Mon Sep 17 00:00:00 2001
+From b383c6bc3a5c83451554b0aa7889ad0f5a114acf Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation

CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch

@@ -1,4 +1,4 @@
-From da5252ec69e061ba0590e33cbe2d6905f9f9ccad Mon Sep 17 00:00:00 2001
+From 7274e6aade5fb13d9d54b8ff5a501d5aa8cbd526 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 09:01:50 +1000
 Subject: [PATCH] Disable ResourceLeakDetector

CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch

@@ -1,4 +1,4 @@
-From 6f601d01d23d9f1c4140ff1a6a47e6d0a7014300 Mon Sep 17 00:00:00 2001
+From 0ff525c958d2e06490603a320436af1576b3b862 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Sat, 5 Jul 2014 16:56:44 +0100
 Subject: [PATCH] Add More Information to session.lock Errors

CraftBukkit-Patches/0152-Safer-JSON-Loading.patch

@@ -1,4 +1,4 @@
-From 5e48f28aa1c321d023ecdd982eee5e931480c3f5 Mon Sep 17 00:00:00 2001
+From 357d82dd4e4a803381078f2f7975b9c760c6018b Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 8 Jul 2014 09:44:18 +1000
 Subject: [PATCH] Safer JSON Loading

CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch

@@ -1,4 +1,4 @@
-From 69ab1b87c72d246a05e4dfa6c5d7211ad154b076 Mon Sep 17 00:00:00 2001
+From 39587c6b33c6c34012bcd01324c7e1bf01a5c75e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 20:27:52 +1000
 Subject: [PATCH] Fix Slow "Loading Libraries"

CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch

@@ -1,4 +1,4 @@
-From 36c0c524c88630816c37c93f04b01a3ea54e991a Mon Sep 17 00:00:00 2001
+From e71f9d9c02ecbd2b939ee82c5a6b651209870616 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 9 Jul 2014 10:35:44 +1000
 Subject: [PATCH] Add CommandLine EULA Flag

CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch

@@ -1,4 +1,4 @@
-From 20a6b7bbdb42f7b8b915abb9195c8177149adc42 Mon Sep 17 00:00:00 2001
+From 2ea7ca473fd5be5078e2fb0eb72d50abb9cb8276 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Mon, 14 Jul 2014 23:43:10 +0100
 Subject: [PATCH] Fix misnamed function from 1.7.10 update

CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch

@@ -1,4 +1,4 @@
-From aed01ff3efe421387046f6c445da2ccc54ed929b Mon Sep 17 00:00:00 2001
+From feb92c0e8b761aac7a0598b39c6e300df0d18ada Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Thu, 17 Jul 2014 21:13:15 -0400
 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked

CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch

@@ -1,4 +1,4 @@
-From 64ca139b248f73d33d65f10cc86b3f5807d37018 Mon Sep 17 00:00:00 2001
+From a6130705a785773fb3423d9b075ba85941d40ab2 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 12:49:48 +0100
 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots

CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch

@@ -1,4 +1,4 @@
-From 696982a3650b8979b001cc0e7d8388c3d25ffacf Mon Sep 17 00:00:00 2001
+From af80849ef89df89030f083a5cc14ae2faa736bcb Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes

CraftBukkit-Patches/0159-Fix-IP-banning.patch

@@ -1,4 +1,4 @@
-From f2187b5577e9784072aa804e46b0e3c920a9f989 Mon Sep 17 00:00:00 2001
+From 95177bb2a7b080af6852eb63b4d4e6f4c16bf882 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 22:13:44 +0100
 Subject: [PATCH] Fix IP banning

CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch

@@ -1,4 +1,4 @@
-From 04f024c52f9718f4bfe6267adfd69ab526c0faf7 Mon Sep 17 00:00:00 2001
+From c8fe049a4daea2cf9b6c6e61009f18a7477e0a5e Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable

CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch

@@ -1,4 +1,4 @@
-From 8163c7a152a768688bd67b61ebfb1b195c037292 Mon Sep 17 00:00:00 2001
+From 9f9d45256684b586ca9bb5b0e6712e49d5eb1663 Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Thu, 26 Jun 2014 18:37:29 -0400
 Subject: [PATCH] Fix Null Tile Entity Worlds

CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch

@@ -1,4 +1,4 @@
-From c3924409b94295a066fe294cb35c095f9b968bee Mon Sep 17 00:00:00 2001
+From e69ef558ecb3e2bc989b8421d643234ab67be6f3 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable

CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch

@@ -1,4 +1,4 @@
-From ab9f3b9bace0c77f16bd6e18d1b1f5454452e37d Mon Sep 17 00:00:00 2001
+From 20a4b5d5d28823990a3a0b43219322907cc2d936 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Thu, 24 Jul 2014 13:18:36 +0200
 Subject: [PATCH] Log debug levels to the log file.

CraftBukkit-Patches/0164-Alternative-Hopper-Ticking.patch

@@ -1,4 +1,4 @@
-From d30aec8b132bc434e89917e6216d0c6d65f685ca Mon Sep 17 00:00:00 2001
+From ae9b5ac4a377b7491baef642727e1c46d2636bee Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Sat, 19 Apr 2014 16:58:26 -0400
 Subject: [PATCH] Alternative Hopper Ticking

CraftBukkit-Patches/0165-Apply-NBTReadLimiter-to-more-things.patch

@@ -1,4 +1,4 @@
-From 25521b2621ae8b57eab0b24dcd4be04113468af7 Mon Sep 17 00:00:00 2001
+From e31b524ba7d6dee439a342096ddf01ac026985ea Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 27 Jul 2014 20:46:04 +1000
 Subject: [PATCH] Apply NBTReadLimiter to more things.

CraftBukkit-Patches/0166-Allow-Attribute-Capping.patch

@@ -1,4 +1,4 @@
-From 1c0463570cae7693d88da1b2953bcbb19e417df1 Mon Sep 17 00:00:00 2001
+From 2e52f5674fe8513833304c4234b0f58c318c3ce3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 28 Jul 2014 16:55:51 +1000
 Subject: [PATCH] Allow Attribute Capping.

CraftBukkit-Patches/0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch

@@ -1,4 +1,4 @@
-From 821b62358576bd2c097cfb3edca4785114afa570 Mon Sep 17 00:00:00 2001
+From e87f59391db7d6cc2552b22d8e946800962ead28 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Mon, 28 Jul 2014 11:42:11 +0100
 Subject: [PATCH] Add an option for a global cache for any request on Mojang's

CraftBukkit-Patches/0168-Only-fetch-an-online-UUID-in-online-mode.patch

@@ -1,4 +1,4 @@
-From 1382634a0c67d1be66fa280d949b1d071878ecd7 Mon Sep 17 00:00:00 2001
+From 67b3c5662e7681b4f8db81e16fd9250509eb18fa Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode

CraftBukkit-Patches/0169-Filter-attribute-modifiers-which-cause-the-attribute.patch

@@ -1,4 +1,4 @@
-From b29947e0d00b8a2b937724dc8bd675969626039c Mon Sep 17 00:00:00 2001
+From 79ea596dbf0fd1be612242139bb967e3687df8e1 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 31 Jul 2014 17:48:20 +0100
 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go

CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch

@@ -1,4 +1,4 @@
-From 9858b4ac043e705973905d561974780ae2d5e73d Mon Sep 17 00:00:00 2001
+From 0102dc4e41312fdd63c4518b142462d1c851b3c4 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Thu, 31 Jul 2014 20:05:06 -0500
 Subject: [PATCH] Fix missed diff from Minecraft 1.3.1 update
@@ -19,3 +19,4 @@ index cc1b095..6f60cac 100644
                  // CraftBukkit end
 -- 
 1.9.1
+

Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch

@@ -1,11 +1,11 @@
-From c524cf90c856318e8b84e32e7cdad8eba7c67043 Mon Sep 17 00:00:00 2001
+From 23836a86f4f24c86c337052597966f7801cc12ee Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Tue, 24 Jun 2014 07:39:37 -0500
 Subject: [PATCH] Configurable damage multiplier for PvP blocking
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 01062ce..a75e854 100644
+index f3e4328..331d3e1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -20,6 +20,8 @@ import org.bukkit.event.player.PlayerDropItemEvent;
@@ -17,7 +17,7 @@ index 01062ce..a75e854 100644
  public abstract class EntityHuman extends EntityLiving implements ICommandListener {
  
      public PlayerInventory inventory = new PlayerInventory(this);
-@@ -812,7 +814,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -824,7 +826,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
          // CraftBukkit end
          if (!this.isInvulnerable()) {
              if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) {

Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch

@@ -1,4 +1,4 @@
-From 83ecf982af0d6ad2ce531e2dabefe0e3e1d27b97 Mon Sep 17 00:00:00 2001
+From 03fd82c592adf649a22887945ddc2b2cb8655e4e Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Tue, 8 Jul 2014 21:41:43 -0500
 Subject: [PATCH] Player Exhaustion Multipliers
@@ -27,10 +27,10 @@ index 0893a6f..89c2832 100644
              ItemStack itemstack = this.j(l);
  
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a75e854..814a02b 100644
+index 331d3e1..8882a40 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -996,7 +996,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -1008,7 +1008,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
                              }
                          }
  
@@ -39,7 +39,7 @@ index a75e854..814a02b 100644
                      } else if (flag1) {
                          entity.extinguish();
                      }
-@@ -1256,9 +1256,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -1268,9 +1268,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
          super.bj();
          this.a(StatisticList.r, 1);
          if (this.isSprinting()) {
@@ -51,7 +51,7 @@ index a75e854..814a02b 100644
          }
      }
  
-@@ -1294,13 +1294,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -1306,13 +1306,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
                  i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
                  if (i > 0) {
                      this.a(StatisticList.m, i);
@@ -67,7 +67,7 @@ index a75e854..814a02b 100644
                  }
              } else if (this.h_()) {
                  if (d1 > 0.0D) {
-@@ -1311,9 +1311,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -1323,9 +1323,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
                  if (i > 0) {
                      this.a(StatisticList.h, i);
                      if (this.isSprinting()) {