Upstream merge

Bukkit

@@ -1 +1 @@
-Subproject commit d3ab9468c3aed2a06c280bf6c9cea5108c736dcc
+Subproject commit 8d5b4c1e9acc499377da0d807e7ca2245d5c3bdf

CraftBukkit

@@ -1 +1 @@
-Subproject commit a04b586418538c428d0e464df3e2a1f3b06889fd
+Subproject commit 0b2ed13a5d24fd9620f8b03c1bf888e3eccd715e

CraftBukkit-Patches/0013-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From db3cbdbfeb80da9f6339c9445155d091f232e4bb Mon Sep 17 00:00:00 2001
+From 1aa4498454d99ecd879c2f7e0885e396bb79af40 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -781,10 +781,10 @@ index 9cf1b49..c249e77 100644
  
          Server server = queuedChunk.provider.world.getServer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 84dcfcc..100c348 100644
+index 9fea4fb..8442ecb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -342,7 +342,9 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -346,7 +346,9 @@ public class CraftScheduler implements BukkitScheduler {
              }
              if (task.isSync()) {
                  try {

CraftBukkit-Patches/0023-Thread-Naming-and-Tweaks.patch

@@ -1,4 +1,4 @@
-From 2505ba3727be53aba5e850d5d25a59e59d2403c3 Mon Sep 17 00:00:00 2001
+From 94171e10243a8feca65e35c70a9a4774e43c178a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
@@ -6,10 +6,10 @@ Subject: [PATCH] Thread Naming and Tweaks
 Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 100c348..a9fdc9f 100644
+index 8442ecb..93d8d42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -71,7 +71,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -72,7 +72,7 @@ public class CraftScheduler implements BukkitScheduler {
       */
      private final ConcurrentHashMap<Integer, CraftTask> runners = new ConcurrentHashMap<Integer, CraftTask>();
      private volatile int currentTick = -1;

CraftBukkit-Patches/0145-Add-damager-to-the-unhandled-error.patch

@@ -1,22 +1,49 @@
-From 2a2b162d6ba595dee0e424f6362f71a8f6092e93 Mon Sep 17 00:00:00 2001
+From 46519dba9ccaa29b7e2c9de4aaa81fa3a1dad02f Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 26 Jun 2014 23:42:52 +0100
 Subject: [PATCH] Add damager to the unhandled error
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0db8897..c8e3db0 100644
+index 6cc8a2d..feac545 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -207,7 +207,7 @@ public class CraftEventFactory {
+      */
+     public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
+         if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
+-            throw new AssertionError(String.format("%s performing %s with %s", who, action, itemstack));
++            throw new IllegalArgumentException(String.format("%s performing %s with %s", who, action, itemstack)); // Spigot
+         }
+         return callPlayerInteractEvent(who, action, 0, 256, 0, 0, itemstack);
+     }
+@@ -479,7 +479,7 @@ public class CraftEventFactory {
+             if (source == DamageSource.CACTUS) {
+                 cause = DamageCause.CONTACT;
+             } else {
+-                throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex));
++                throw new RuntimeException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); // Spigot
+             }
+             EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
+             if (!event.isCancelled()) {
 @@ -497,7 +497,7 @@ public class CraftEventFactory {
              } else if (source == DamageSource.FALL) {
                  cause = DamageCause.FALL;
              } else {
--                throw new RuntimeException("Unhandled entity damage");
+-                throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex));
-+                throw new RuntimeException("Unhandled entity damage from " + damager.getHandle().getName()); // Spigot - Add damager
++                throw new RuntimeException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex)); // Spigot
              }
              EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
+@@ -535,7 +535,7 @@ public class CraftEventFactory {
+             return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
+         }
+ 
+-        throw new AssertionError(String.format("Unhandled damage of %s from %s", entity, source.translationIndex));
++        throw new RuntimeException(String.format("Unhandled damage of %s from %s", entity, source.translationIndex)); // Spigot
+     }
+ 
+     private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions) {
 -- 
 1.9.1