diff --git a/CraftBukkit-Patches/0024-Allow-disabling-of-spawn-chunks-always-being-loaded.patch b/CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch
similarity index 100%
rename from CraftBukkit-Patches/0024-Allow-disabling-of-spawn-chunks-always-being-loaded.patch
rename to CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch
diff --git a/CraftBukkit-Patches/0023-Don-t-tick-chests.patch b/CraftBukkit-Patches/0023-Don-t-tick-chests.patch
deleted file mode 100644
index c5084fe230..0000000000
--- a/CraftBukkit-Patches/0023-Don-t-tick-chests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Mon, 7 Jul 2014 16:28:46 -0500
-Subject: [PATCH] Don't tick chests
-
-
-diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntityChest.java
-+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
-@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory {
-         super.h();
-         if (this.world == null) return; // CraftBukkit
-         this.i();
--        ++this.ticks;
-+        //++this.ticks; // PaperSpigot - Don't tick chests
-         float f;
- 
-+        /* PaperSpigot start - Don't tick chests
-         if (!this.world.isStatic && this.o != 0 && (this.ticks + this.x + this.y + this.z) % 200 == 0) {
-             this.o = 0;
-             f = 5.0F;
-@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory {
-                 }
-             }
-         }
-+        PaperSpigot end */
- 
-         this.n = this.m;
-         f = 0.1F;
---
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch
similarity index 100%
rename from CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch
rename to CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch
diff --git a/CraftBukkit-Patches/0026-Revert-Bukkit-Damage-API-Behavior.patch b/CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch
similarity index 100%
rename from CraftBukkit-Patches/0026-Revert-Bukkit-Damage-API-Behavior.patch
rename to CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch
diff --git a/CraftBukkit-Patches/0027-Better-EULA-handling.patch b/CraftBukkit-Patches/0026-Better-EULA-handling.patch
similarity index 100%
rename from CraftBukkit-Patches/0027-Better-EULA-handling.patch
rename to CraftBukkit-Patches/0026-Better-EULA-handling.patch
diff --git a/CraftBukkit-Patches/0027-Don-t-tick-chests.patch b/CraftBukkit-Patches/0027-Don-t-tick-chests.patch
new file mode 100644
index 0000000000..17ae691482
--- /dev/null
+++ b/CraftBukkit-Patches/0027-Don-t-tick-chests.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Iceee <andrew@opticgaming.tv>
+Date: Tue, 8 Jul 2014 22:51:47 -0500
+Subject: [PATCH] Don't tick chests
+
+
+diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/TileEntityChest.java
++++ b/src/main/java/net/minecraft/server/TileEntityChest.java
+@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory {
+         super.h();
+         if (this.world == null) return; // CraftBukkit
+         this.i();
+-        ++this.ticks;
++        // PaperSpigot start - Don't tick chests
++        /* ++this.ticks;
+         float f;
+ 
+         if (!this.world.isStatic && this.o != 0 && (this.ticks + this.x + this.y + this.z) % 200 == 0) {
+@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory {
+             if (this.m < 0.0F) {
+                 this.m = 0.0F;
+             }
+-        }
++        } */
+     }
+ 
+     public boolean c(int i, int j) {
+@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory {
+         if (this.world == null) return; // CraftBukkit
+         this.world.playBlockAction(this.x, this.y, this.z, this.q(), 1, this.o);
+ 
++        // PaperSpigot start - Sound handling here now that we're not ticking chests
++        float f = 0.1F;
++        double d0;
++        if (this.o > 0 && this.m == 0.0F && this.i == null && this.k == null) {
++            double d1 = (double) this.x + 0.5D;
++            d0 = (double) this.z + 0.5D;
++
++            if (this.l != null) {
++                d0 += 0.5D;
++            }
++
++            if (this.j != null) {
++                d1 += 0.5D;
++            }
++
++            this.world.makeSound(d1, (double) this.y + 0.5D, d0, "random.chestopen", 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++        }
++        // PaperSpigot end
++
+         // CraftBukkit start - Call redstone event
+         if (this.q() == Blocks.TRAPPED_CHEST) {
+             int newPower = Math.max(0, Math.min(15, this.o));
+@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory {
+             if (this.world == null) return; // CraftBukkit
+             this.world.playBlockAction(this.x, this.y, this.z, this.q(), 1, this.o);
+ 
++            // PaperSpigot start - Sound handling here now that we're not ticking chests
++            double d0;
++
++            if (this.o == 0 && this.i == null && this.k == null) {
++                d0 = (double) this.x + 0.5D;
++                double d2 = (double) this.z + 0.5D;
++
++                if (this.l != null) {
++                    d2 += 0.5D;
++                }
++
++                if (this.j != null) {
++                    d0 += 0.5D;
++                }
++
++                this.world.makeSound(d0, (double) this.y + 0.5D, d2, "random.chestclosed", 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++            }
++            // PaperSpigot end
++
+             // CraftBukkit start - Call redstone event
+             if (this.q() == Blocks.TRAPPED_CHEST) {
+                 int newPower = Math.max(0, Math.min(15, this.o));
+--
\ No newline at end of file