From 552e1c5afdd3216faef0d60293f07a6ed947a10a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 11 Aug 2014 15:45:57 -0500 Subject: [PATCH] Remove 0026-Don-t-tick-chests, we'll be slightly changing our implementation --- .../0026-Don-t-tick-chests.patch | 84 ------------------- ...on-generator-tendency-to-move-north.patch} | 0 ...k-entities-that-are-above-the-speci.patch} | 0 ...=> 0028-Don-t-log-debug-information.patch} | 0 ...e-speed-for-water-flowing-over-lava.patch} | 0 ... 0030-Center-TNT-grid-sample-points.patch} | 0 ...=> 0031-Player-affects-spawning-API.patch} | 0 ...h => 0032-Configurable-hanging-tick.patch} | 0 ...c-as-an-element-not-an-extra-object.patch} | 0 9 files changed, 84 deletions(-) delete mode 100644 Spigot-Server-Patches/0026-Don-t-tick-chests.patch rename Spigot-Server-Patches/{0027-Fix-random-position-generator-tendency-to-move-north.patch => 0026-Fix-random-position-generator-tendency-to-move-north.patch} (100%) rename Spigot-Server-Patches/{0028-Drop-falling-block-entities-that-are-above-the-speci.patch => 0027-Drop-falling-block-entities-that-are-above-the-speci.patch} (100%) rename Spigot-Server-Patches/{0029-Don-t-log-debug-information.patch => 0028-Don-t-log-debug-information.patch} (100%) rename Spigot-Server-Patches/{0030-Configurable-speed-for-water-flowing-over-lava.patch => 0029-Configurable-speed-for-water-flowing-over-lava.patch} (100%) rename Spigot-Server-Patches/{0031-Center-TNT-grid-sample-points.patch => 0030-Center-TNT-grid-sample-points.patch} (100%) rename Spigot-Server-Patches/{0032-Player-affects-spawning-API.patch => 0031-Player-affects-spawning-API.patch} (100%) rename Spigot-Server-Patches/{0033-Configurable-hanging-tick.patch => 0032-Configurable-hanging-tick.patch} (100%) rename Spigot-Server-Patches/{0034-treat-this.c-as-an-element-not-an-extra-object.patch => 0033-treat-this.c-as-an-element-not-an-extra-object.patch} (100%) diff --git a/Spigot-Server-Patches/0026-Don-t-tick-chests.patch b/Spigot-Server-Patches/0026-Don-t-tick-chests.patch deleted file mode 100644 index 9b05ef4a85..0000000000 --- a/Spigot-Server-Patches/0026-Don-t-tick-chests.patch +++ /dev/null @@ -1,84 +0,0 @@ -From fdd261f946571e63e092fc7e4c3f1553f473c6f6 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 c900caf..ce612ad 100644 ---- a/src/main/java/net/minecraft/server/TileEntityChest.java -+++ b/src/main/java/net/minecraft/server/TileEntityChest.java -@@ -249,6 +249,8 @@ 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(); -@@ -327,6 +329,7 @@ public class TileEntityChest extends TileEntity implements IInventory { - this.m = 0.0F; - } - } -+ */ - } - - public boolean c(int i, int j) { -@@ -349,6 +352,26 @@ 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)); -@@ -371,6 +394,26 @@ 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)); --- -1.9.1 - diff --git a/Spigot-Server-Patches/0027-Fix-random-position-generator-tendency-to-move-north.patch b/Spigot-Server-Patches/0026-Fix-random-position-generator-tendency-to-move-north.patch similarity index 100% rename from Spigot-Server-Patches/0027-Fix-random-position-generator-tendency-to-move-north.patch rename to Spigot-Server-Patches/0026-Fix-random-position-generator-tendency-to-move-north.patch diff --git a/Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch similarity index 100% rename from Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch rename to Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch diff --git a/Spigot-Server-Patches/0029-Don-t-log-debug-information.patch b/Spigot-Server-Patches/0028-Don-t-log-debug-information.patch similarity index 100% rename from Spigot-Server-Patches/0029-Don-t-log-debug-information.patch rename to Spigot-Server-Patches/0028-Don-t-log-debug-information.patch diff --git a/Spigot-Server-Patches/0030-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0029-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from Spigot-Server-Patches/0030-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0029-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/Spigot-Server-Patches/0031-Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/0030-Center-TNT-grid-sample-points.patch similarity index 100% rename from Spigot-Server-Patches/0031-Center-TNT-grid-sample-points.patch rename to Spigot-Server-Patches/0030-Center-TNT-grid-sample-points.patch diff --git a/Spigot-Server-Patches/0032-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0031-Player-affects-spawning-API.patch similarity index 100% rename from Spigot-Server-Patches/0032-Player-affects-spawning-API.patch rename to Spigot-Server-Patches/0031-Player-affects-spawning-API.patch diff --git a/Spigot-Server-Patches/0033-Configurable-hanging-tick.patch b/Spigot-Server-Patches/0032-Configurable-hanging-tick.patch similarity index 100% rename from Spigot-Server-Patches/0033-Configurable-hanging-tick.patch rename to Spigot-Server-Patches/0032-Configurable-hanging-tick.patch diff --git a/Spigot-Server-Patches/0034-treat-this.c-as-an-element-not-an-extra-object.patch b/Spigot-Server-Patches/0033-treat-this.c-as-an-element-not-an-extra-object.patch similarity index 100% rename from Spigot-Server-Patches/0034-treat-this.c-as-an-element-not-an-extra-object.patch rename to Spigot-Server-Patches/0033-treat-this.c-as-an-element-not-an-extra-object.patch