From 187d3ce6322e7691a55006f5c73082de39321669 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Mon, 11 Aug 2014 15:45:57 -0500 Subject: [PATCH] Remove 0026-Don-t-tick-chests, we'll be slightly changing our implementation --- Spigot-Server-Patches/Don-t-tick-chests.patch | 82 ------------------- 1 file changed, 82 deletions(-) delete mode 100644 Spigot-Server-Patches/Don-t-tick-chests.patch diff --git a/Spigot-Server-Patches/Don-t-tick-chests.patch b/Spigot-Server-Patches/Don-t-tick-chests.patch deleted file mode 100644 index 498f6aafb0..0000000000 --- a/Spigot-Server-Patches/Don-t-tick-chests.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Iceee -Date: Fri, 11 Jul 2014 01:31:43 -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 { - } - - public void h() { -+ // PaperSpigot start - Don't tick chests at all, period -+ /* - super.h(); - if (this.world == null) return; // CraftBukkit - this.i(); -@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntity implements IInventory { - 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 - Move chest open sound handling down here -+ this.i(); -+ 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 - Move chest close sound handling down here -+ this.i(); -+ 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