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 93% 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 index c4df86674..1c5c76bea 100644 --- 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 @@ -1,11 +1,11 @@ -From 9950f9c12273919665410851fcc1fc03fff79a75 Mon Sep 17 00:00:00 2001 +From ac6e927fe693f9aad65e4f891acb012d3c2c851a Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Tue, 8 Jul 2014 23:55:29 +0100 Subject: [PATCH] Allow disabling of spawn chunks always being loaded diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9b10da7..1d949e7 100644 +index 9741e94..2dc61fc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -285,6 +285,8 @@ public abstract class World implements IBlockAccess { 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 4dec99020..000000000 --- a/CraftBukkit-Patches/0023-Don-t-tick-chests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 722471328e7515099b512065c208785a1f0443da Mon Sep 17 00:00:00 2001 -From: Zach Brown -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 4f45dba..07c368d 100644 ---- a/src/main/java/net/minecraft/server/TileEntityChest.java -+++ b/src/main/java/net/minecraft/server/TileEntityChest.java -@@ -252,9 +252,10 @@ 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; -@@ -273,6 +274,7 @@ public class TileEntityChest extends TileEntity implements IInventory { - } - } - } -+ PaperSpigot end */ - - this.n = this.m; - f = 0.1F; --- -1.9.1 - diff --git a/CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch similarity index 91% rename from CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch index e72e11c91..f34792e83 100644 --- a/CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch @@ -1,4 +1,4 @@ -From d60dc3eab52d9205ce594691e2fac0b340290129 Mon Sep 17 00:00:00 2001 +From d0c766d5ab0038550cf9abc3603538fbb33773f4 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/CraftBukkit-Patches/0026-Revert-Bukkit-Damage-API-Behavior.patch b/CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch similarity index 97% rename from CraftBukkit-Patches/0026-Revert-Bukkit-Damage-API-Behavior.patch rename to CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch index e0861e3df..ff764f068 100644 --- a/CraftBukkit-Patches/0026-Revert-Bukkit-Damage-API-Behavior.patch +++ b/CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch @@ -1,4 +1,4 @@ -From fff7efbaf9c3df799386163152ee335d1ff84b24 Mon Sep 17 00:00:00 2001 +From d4704f5db1d3d651344b8c385b211722c54eae02 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 8 Jul 2014 21:49:42 -0500 Subject: [PATCH] Revert Bukkit Damage API Behavior diff --git a/CraftBukkit-Patches/0027-Better-EULA-handling.patch b/CraftBukkit-Patches/0026-Better-EULA-handling.patch similarity index 98% rename from CraftBukkit-Patches/0027-Better-EULA-handling.patch rename to CraftBukkit-Patches/0026-Better-EULA-handling.patch index b1813b1a7..45e17014e 100644 --- a/CraftBukkit-Patches/0027-Better-EULA-handling.patch +++ b/CraftBukkit-Patches/0026-Better-EULA-handling.patch @@ -1,4 +1,4 @@ -From d95189e8abe6482067e5f3f36b5ce19c5424f2bd Mon Sep 17 00:00:00 2001 +From b72b08303cfcc8424fdf55f54ac41f1978341802 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 8 Jul 2014 22:39:41 -0500 Subject: [PATCH] Better EULA handling 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 000000000..c85e2b9b3 --- /dev/null +++ b/CraftBukkit-Patches/0027-Don-t-tick-chests.patch @@ -0,0 +1,84 @@ +From 18801c8a166e2218b454c809a2e7f6570ba5f0c6 Mon Sep 17 00:00:00 2001 +From: Iceee +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 +