diff --git a/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
index 5ed26d2759..38081ae5db 100644
--- a/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
+++ b/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
@@ -1,14 +1,14 @@
-From 5497c0768aacaa2d1840790d436b55c4bd9ed379 Mon Sep 17 00:00:00 2001
+From 883d7fccf95356015d2fd974ac88c16dde438a7f 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 0abfc60..0e072fe 100644
+index 646ee2b..bfa218b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -188,7 +188,7 @@ public class CraftEventFactory {
+@@ -189,7 +189,7 @@ public class CraftEventFactory {
       */
      public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack, EnumHand hand) {
          if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
@@ -17,7 +17,7 @@ index 0abfc60..0e072fe 100644
          }
          return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack, hand);
      }
-@@ -486,7 +486,7 @@ public class CraftEventFactory {
+@@ -496,7 +496,7 @@ public class CraftEventFactory {
              if (source == DamageSource.CACTUS) {
                  cause = DamageCause.CONTACT;
              } else {
@@ -26,7 +26,7 @@ index 0abfc60..0e072fe 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -506,7 +506,7 @@ public class CraftEventFactory {
+@@ -516,7 +516,7 @@ public class CraftEventFactory {
              } else if (source == DamageSource.DRAGON_BREATH) {
                  cause = DamageCause.DRAGON_BREATH;
              } else {
@@ -35,7 +35,7 @@ index 0abfc60..0e072fe 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -546,7 +546,7 @@ public class CraftEventFactory {
+@@ -556,7 +556,7 @@ public class CraftEventFactory {
              return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
          }
  
diff --git a/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
index c70c2d747b..5592ac165c 100644
--- a/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 4a43a9f06645e1ac3e219ee711084a95e846ed2c Mon Sep 17 00:00:00 2001
+From e87ff2924bd5b604551eba4fc075f71a6dbdb95c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 3 Mar 2016 19:45:46 +1100
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -19,10 +19,10 @@ index efe792b..a7903a2 100644
                          ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
                          world.triggerEffect(2004, blockposition, 0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0e072fe..f330757 100644
+index bfa218b..dd50e8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -988,6 +988,21 @@ public class CraftEventFactory {
+@@ -998,6 +998,21 @@ public class CraftEventFactory {
          return event;
      }