diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch
index 8ebbc6f2d..bd8c79105 100644
--- a/Bukkit-Patches/0002-Spigot-Timings.patch
+++ b/Bukkit-Patches/0002-Spigot-Timings.patch
@@ -272,9 +272,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          if (!eventClass.isAssignableFrom(event.getClass())) {
                              return;
                          }
-+                        timings.startTiming(); // Spigot
++                        // Spigot start
++                        boolean isAsync = event.isAsynchronous();
++                        if (!isAsync) timings.startTiming();
                          method.invoke(listener, event);
-+                        timings.stopTiming(); // Spigot
++                        if (!isAsync) timings.stopTiming();
++                        // Spigot end
                      } catch (InvocationTargetException ex) {
                          throw new EventException(ex.getCause());
                      } catch (Throwable t) {
diff --git a/CraftBukkit-Patches/0174-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0174-Fix-Corrupted-Trapped-Chest.patch
new file mode 100644
index 000000000..650b48471
--- /dev/null
+++ b/CraftBukkit-Patches/0174-Fix-Corrupted-Trapped-Chest.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Fri, 15 Aug 2014 00:56:41 -0400
+Subject: [PATCH] Fix Corrupted Trapped Chest
+
+The CraftBukkit code that auto repairs corrupted tile entities never was updated for Trapped Chest.
+If a Trapped Chest gets its Tile Entity corrupted, it will crash the server every time the chunk is loaded.
+
+This will now fix Trapped Chests too.
+
+diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
++++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -0,0 +0,0 @@ public class WorldServer extends World {
+         TileEntity result = super.getTileEntity(i, j, k);
+         Block type = getType(i, j, k);
+ 
+-        if (type == Blocks.CHEST) {
++        if (type == Blocks.CHEST || type == Blocks.TRAPPED_CHEST) { // Spigot
+             if (!(result instanceof TileEntityChest)) {
+                 result = fixTileEntity(i, j, k, type, result);
+             }
+--
\ No newline at end of file