From 755651ac280d460be4b612e7bd9203166193c5e8 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 c900caf..dfa2ce2 100644
--- a/src/main/java/net/minecraft/server/TileEntityChest.java
+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
@@ -252,7 +252,8 @@ 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) {
@@ -326,7 +327,7 @@ public class TileEntityChest extends TileEntity implements IInventory {
             if (this.m < 0.0F) {
                 this.m = 0.0F;
             }
-        }
+        } */
     }
 
     public boolean c(int i, int j) {
@@ -349,6 +350,25 @@ 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));
@@ -371,6 +391,25 @@ 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));
-- 
1.9.1