From fad5e2de6e1a91bcecb50be3e1a79969de56d3aa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 Jun 2014 15:55:54 -0500 Subject: [PATCH] Update patch numbers --- ....patch => 0147-Rename-to-PaperSpigot.patch} | 2 +- ...ll-hopper-owners-crashing-the-server.patch} | 16 +++++++--------- ...low-undead-horse-types-to-be-leashed.patch} | 2 +- ...leport-passenger-vehicle-with-player.patch} | 6 +++--- ...-Invisible-players-don-t-have-rights.patch} | 6 +++--- ...0152-Configurable-squid-spawn-ranges.patch} | 2 +- ... 0153-Add-getFloat-method-to-configs.patch} | 4 ++-- ...e-damage-multiplier-for-PvP-blocking.patch} | 2 +- ...ctus-and-reed-natural-growth-heights.patch} | 2 +- ...figurable-baby-zombie-movement-speed.patch} | 2 +- ...e-destroyed-boats-drop-the-boat-item.patch} | 2 +- ...ger-multiplier-for-player-sprint-jum.patch} | 2 +- ...59-Inverted-Daylight-Detector-Toggle.patch} | 2 +- ...0-Add-1.8-recipes-for-stone-variants.patch} | 2 +- ...=> 0161-Fix-movement-inconsistencies.patch} | 18 +++++++++--------- ...atch => 0162-Fix-redstone-lag-issues.patch} | 4 ++-- ...0163-Ability-to-disable-asynccatcher.patch} | 4 ++-- 17 files changed, 38 insertions(+), 40 deletions(-) rename CraftBukkit-Patches/{0149-Rename-to-PaperSpigot.patch => 0147-Rename-to-PaperSpigot.patch} (93%) rename CraftBukkit-Patches/{0150-Prevent-null-hopper-owners-crashing-the-server.patch => 0148-Prevent-null-hopper-owners-crashing-the-server.patch} (93%) rename CraftBukkit-Patches/{0151-Allow-undead-horse-types-to-be-leashed.patch => 0149-Allow-undead-horse-types-to-be-leashed.patch} (97%) rename CraftBukkit-Patches/{0152-Teleport-passenger-vehicle-with-player.patch => 0150-Teleport-passenger-vehicle-with-player.patch} (97%) rename CraftBukkit-Patches/{0153-Invisible-players-don-t-have-rights.patch => 0151-Invisible-players-don-t-have-rights.patch} (95%) rename CraftBukkit-Patches/{0154-Configurable-squid-spawn-ranges.patch => 0152-Configurable-squid-spawn-ranges.patch} (96%) rename CraftBukkit-Patches/{0155-Add-getFloat-method-to-configs.patch => 0153-Add-getFloat-method-to-configs.patch} (94%) rename CraftBukkit-Patches/{0156-Configurable-damage-multiplier-for-PvP-blocking.patch => 0154-Configurable-damage-multiplier-for-PvP-blocking.patch} (96%) rename CraftBukkit-Patches/{0157-Configurable-cactus-and-reed-natural-growth-heights.patch => 0155-Configurable-cactus-and-reed-natural-growth-heights.patch} (97%) rename CraftBukkit-Patches/{0158-Configurable-baby-zombie-movement-speed.patch => 0156-Configurable-baby-zombie-movement-speed.patch} (96%) rename CraftBukkit-Patches/{0159-Make-destroyed-boats-drop-the-boat-item.patch => 0157-Make-destroyed-boats-drop-the-boat-item.patch} (97%) rename CraftBukkit-Patches/{0160-Configurable-hunger-multiplier-for-player-sprint-jum.patch => 0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch} (96%) rename CraftBukkit-Patches/{0161-Inverted-Daylight-Detector-Toggle.patch => 0159-Inverted-Daylight-Detector-Toggle.patch} (97%) rename CraftBukkit-Patches/{0162-Add-1.8-recipes-for-stone-variants.patch => 0160-Add-1.8-recipes-for-stone-variants.patch} (97%) rename CraftBukkit-Patches/{0163-Fix-movement-inconsistencies.patch => 0161-Fix-movement-inconsistencies.patch} (97%) rename CraftBukkit-Patches/{0164-Fix-redstone-lag-issues.patch => 0162-Fix-redstone-lag-issues.patch} (92%) rename CraftBukkit-Patches/{0165-Ability-to-disable-asynccatcher.patch => 0163-Ability-to-disable-asynccatcher.patch} (93%) diff --git a/CraftBukkit-Patches/0149-Rename-to-PaperSpigot.patch b/CraftBukkit-Patches/0147-Rename-to-PaperSpigot.patch similarity index 93% rename from CraftBukkit-Patches/0149-Rename-to-PaperSpigot.patch rename to CraftBukkit-Patches/0147-Rename-to-PaperSpigot.patch index 51cd5b592..b8f540ff6 100644 --- a/CraftBukkit-Patches/0149-Rename-to-PaperSpigot.patch +++ b/CraftBukkit-Patches/0147-Rename-to-PaperSpigot.patch @@ -1,4 +1,4 @@ -From 33e33efcbabfaf4dc2beb6ac2a0dab488ecbd620 Mon Sep 17 00:00:00 2001 +From fd771d95f61823e3bd28a839118cadbba647b60b Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 15 Apr 2014 07:12:20 -0700 Subject: [PATCH] Rename to PaperSpigot diff --git a/CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch b/CraftBukkit-Patches/0148-Prevent-null-hopper-owners-crashing-the-server.patch similarity index 93% rename from CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch rename to CraftBukkit-Patches/0148-Prevent-null-hopper-owners-crashing-the-server.patch index 27920d77f..682c0f1fd 100644 --- a/CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch +++ b/CraftBukkit-Patches/0148-Prevent-null-hopper-owners-crashing-the-server.patch @@ -1,11 +1,11 @@ -From 49438c7205d9dbb80e861a3c7c5bd113e45de256 Mon Sep 17 00:00:00 2001 +From 6642bbcbdf4d07ec3f6b80f8917616071446109a Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 27 May 2014 14:00:41 +0100 Subject: [PATCH] Prevent null hopper owners crashing the server diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index c7b3495..45be65f 100644 +index c7b3495..f7a6140 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -243,13 +243,23 @@ public class TileEntityHopper extends TileEntity implements IHopper { @@ -14,11 +14,6 @@ index c7b3495..45be65f 100644 - if (!this.k()) { - flag = this.x(); -- } -- -- if (!this.l()) { -- flag = suckInItems(this) || flag; -- } + try { // PaperSpigot Start (Try/catch to prevent null owner crash) + if (!this.k()) { + flag = this.x(); @@ -26,8 +21,11 @@ index c7b3495..45be65f 100644 + } catch (NullPointerException e) { + this.getWorld().setAir(this.x, this.y, this.z); + org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Null owner found for hopper, removing hopper at {0} {1}, {2}, {3}", new Object[]{this.getWorld().getWorld().getName(), this.x, this.y, this.z}); -+ } -+ + } + +- if (!this.l()) { +- flag = suckInItems(this) || flag; +- } + try { + if (!this.l()) { + flag = suckInItems(this) || flag; diff --git a/CraftBukkit-Patches/0151-Allow-undead-horse-types-to-be-leashed.patch b/CraftBukkit-Patches/0149-Allow-undead-horse-types-to-be-leashed.patch similarity index 97% rename from CraftBukkit-Patches/0151-Allow-undead-horse-types-to-be-leashed.patch rename to CraftBukkit-Patches/0149-Allow-undead-horse-types-to-be-leashed.patch index 78c43aa30..02eef7ee1 100644 --- a/CraftBukkit-Patches/0151-Allow-undead-horse-types-to-be-leashed.patch +++ b/CraftBukkit-Patches/0149-Allow-undead-horse-types-to-be-leashed.patch @@ -1,4 +1,4 @@ -From 819a750cc7f1c9fcd9a095d1b1c88bca4d5c8000 Mon Sep 17 00:00:00 2001 +From a2dda87b26fb042d7ea601e89d3f7569cc715b9f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 17 May 2014 00:18:54 -0500 Subject: [PATCH] Allow undead horse types to be leashed diff --git a/CraftBukkit-Patches/0152-Teleport-passenger-vehicle-with-player.patch b/CraftBukkit-Patches/0150-Teleport-passenger-vehicle-with-player.patch similarity index 97% rename from CraftBukkit-Patches/0152-Teleport-passenger-vehicle-with-player.patch rename to CraftBukkit-Patches/0150-Teleport-passenger-vehicle-with-player.patch index 983d50276..f2f8373e2 100644 --- a/CraftBukkit-Patches/0152-Teleport-passenger-vehicle-with-player.patch +++ b/CraftBukkit-Patches/0150-Teleport-passenger-vehicle-with-player.patch @@ -1,11 +1,11 @@ -From 4b902c8cdc70203a7be2a525ee6d386284fabc5b Mon Sep 17 00:00:00 2001 +From dd79ea4473f63cc8add72b2b7eb2badf874bb5c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 May 2014 02:12:39 -0500 Subject: [PATCH] Teleport passenger/vehicle with player diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5ac54e3..57861a9 100644 +index 5ac54e3..258bc9d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -39,6 +39,13 @@ public abstract class Entity { @@ -43,7 +43,7 @@ index 5ac54e3..57861a9 100644 if (j == 1 && i == 1) { ChunkCoordinates chunkcoordinates = worldserver1.getSpawn(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a88aec4..7671caf 100644 +index a88aec4..1f9c8a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -477,12 +477,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch b/CraftBukkit-Patches/0151-Invisible-players-don-t-have-rights.patch similarity index 95% rename from CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch rename to CraftBukkit-Patches/0151-Invisible-players-don-t-have-rights.patch index 72835d66d..e7b2fe722 100644 --- a/CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch +++ b/CraftBukkit-Patches/0151-Invisible-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 06e39b81d3cbd88d8225b33e6f6ab9d1286a2ac6 Mon Sep 17 00:00:00 2001 +From 11641dc3de03120d089f1233b2a8355798738817 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 18 May 2014 16:35:38 -0500 Subject: [PATCH] Invisible players don't have rights @@ -34,7 +34,7 @@ index 13903e9..b311508 100644 org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // CraftBukkit - Call event diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a2fa854..4b442c9 100644 +index cb6efc0..f3f48b4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -14,6 +14,7 @@ import java.util.concurrent.Callable; @@ -45,7 +45,7 @@ index a2fa854..4b442c9 100644 import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.LongHashSet; import org.bukkit.craftbukkit.SpigotTimings; // Spigot -@@ -1683,6 +1684,15 @@ public abstract class World implements IBlockAccess { +@@ -1663,6 +1664,15 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); diff --git a/CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch b/CraftBukkit-Patches/0152-Configurable-squid-spawn-ranges.patch similarity index 96% rename from CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch rename to CraftBukkit-Patches/0152-Configurable-squid-spawn-ranges.patch index 294d0a553..05d981ddf 100644 --- a/CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch +++ b/CraftBukkit-Patches/0152-Configurable-squid-spawn-ranges.patch @@ -1,4 +1,4 @@ -From d3a916cb61e990cbecccc77b25e1e29c47d73217 Mon Sep 17 00:00:00 2001 +From 04a108c91f4b58f0b4bfd6ed1d82fe331d86e56a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 19 May 2014 19:30:58 -0500 Subject: [PATCH] Configurable squid spawn ranges diff --git a/CraftBukkit-Patches/0155-Add-getFloat-method-to-configs.patch b/CraftBukkit-Patches/0153-Add-getFloat-method-to-configs.patch similarity index 94% rename from CraftBukkit-Patches/0155-Add-getFloat-method-to-configs.patch rename to CraftBukkit-Patches/0153-Add-getFloat-method-to-configs.patch index 849799adf..213a6774b 100644 --- a/CraftBukkit-Patches/0155-Add-getFloat-method-to-configs.patch +++ b/CraftBukkit-Patches/0153-Add-getFloat-method-to-configs.patch @@ -1,11 +1,11 @@ -From 4ab2112e922501a5ea9f47ab927c97c8787b0cb7 Mon Sep 17 00:00:00 2001 +From 5a76dd1adc306ba33b20b2f8845b3dfd9358be47 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 19 May 2014 21:08:44 -0500 Subject: [PATCH] Add getFloat method to configs diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 5818cab..5ddd593 100644 +index 7c9b298..1e30d4d 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -120,6 +120,14 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0156-Configurable-damage-multiplier-for-PvP-blocking.patch b/CraftBukkit-Patches/0154-Configurable-damage-multiplier-for-PvP-blocking.patch similarity index 96% rename from CraftBukkit-Patches/0156-Configurable-damage-multiplier-for-PvP-blocking.patch rename to CraftBukkit-Patches/0154-Configurable-damage-multiplier-for-PvP-blocking.patch index 1f89bfe9c..2061f37ba 100644 --- a/CraftBukkit-Patches/0156-Configurable-damage-multiplier-for-PvP-blocking.patch +++ b/CraftBukkit-Patches/0154-Configurable-damage-multiplier-for-PvP-blocking.patch @@ -1,4 +1,4 @@ -From d8ac73e9000b772e48821b4c1aba04fec359e7d5 Mon Sep 17 00:00:00 2001 +From 1aea32433cebe0d71abf57b157b26d18b8f23c02 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 19 May 2014 21:13:31 -0500 Subject: [PATCH] Configurable damage multiplier for PvP blocking diff --git a/CraftBukkit-Patches/0157-Configurable-cactus-and-reed-natural-growth-heights.patch b/CraftBukkit-Patches/0155-Configurable-cactus-and-reed-natural-growth-heights.patch similarity index 97% rename from CraftBukkit-Patches/0157-Configurable-cactus-and-reed-natural-growth-heights.patch rename to CraftBukkit-Patches/0155-Configurable-cactus-and-reed-natural-growth-heights.patch index 87296cfe5..e90820913 100644 --- a/CraftBukkit-Patches/0157-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/CraftBukkit-Patches/0155-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,4 +1,4 @@ -From 666cd878dc893ba7089ced9c5eea88cc32c0b955 Mon Sep 17 00:00:00 2001 +From 1f32650458050fa1e47300ad012a26512aa553cf Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 20 May 2014 20:17:36 -0500 Subject: [PATCH] Configurable cactus and reed natural growth heights diff --git a/CraftBukkit-Patches/0158-Configurable-baby-zombie-movement-speed.patch b/CraftBukkit-Patches/0156-Configurable-baby-zombie-movement-speed.patch similarity index 96% rename from CraftBukkit-Patches/0158-Configurable-baby-zombie-movement-speed.patch rename to CraftBukkit-Patches/0156-Configurable-baby-zombie-movement-speed.patch index 955aad881..a57bd4b79 100644 --- a/CraftBukkit-Patches/0158-Configurable-baby-zombie-movement-speed.patch +++ b/CraftBukkit-Patches/0156-Configurable-baby-zombie-movement-speed.patch @@ -1,4 +1,4 @@ -From 3382b9f3e256a354f7147f73ed8624e53424c4c7 Mon Sep 17 00:00:00 2001 +From a9032dacbabca8fe1dbeee1af2b4e34b58df3d43 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 21 May 2014 15:35:12 -0500 Subject: [PATCH] Configurable baby zombie movement speed diff --git a/CraftBukkit-Patches/0159-Make-destroyed-boats-drop-the-boat-item.patch b/CraftBukkit-Patches/0157-Make-destroyed-boats-drop-the-boat-item.patch similarity index 97% rename from CraftBukkit-Patches/0159-Make-destroyed-boats-drop-the-boat-item.patch rename to CraftBukkit-Patches/0157-Make-destroyed-boats-drop-the-boat-item.patch index 443961d0f..4baed2751 100644 --- a/CraftBukkit-Patches/0159-Make-destroyed-boats-drop-the-boat-item.patch +++ b/CraftBukkit-Patches/0157-Make-destroyed-boats-drop-the-boat-item.patch @@ -1,4 +1,4 @@ -From d20db7a1f4a078cb29511b1255ea58f51dd8f6a4 Mon Sep 17 00:00:00 2001 +From 997475dca0a503a3fa4b074f6aea2347b55e29df Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 30 May 2014 19:42:50 -0500 Subject: [PATCH] Make destroyed boats drop the boat item diff --git a/CraftBukkit-Patches/0160-Configurable-hunger-multiplier-for-player-sprint-jum.patch b/CraftBukkit-Patches/0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch similarity index 96% rename from CraftBukkit-Patches/0160-Configurable-hunger-multiplier-for-player-sprint-jum.patch rename to CraftBukkit-Patches/0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch index 8a8dd351d..d53b530f9 100644 --- a/CraftBukkit-Patches/0160-Configurable-hunger-multiplier-for-player-sprint-jum.patch +++ b/CraftBukkit-Patches/0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch @@ -1,4 +1,4 @@ -From a53cc29dc790badee0ec822a06a388365404b22a Mon Sep 17 00:00:00 2001 +From dc75a519f7261309bf4ef06afb83b177952388f5 Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 15 Apr 2014 18:00:02 -0700 Subject: [PATCH] Configurable hunger multiplier for player sprint jumping diff --git a/CraftBukkit-Patches/0161-Inverted-Daylight-Detector-Toggle.patch b/CraftBukkit-Patches/0159-Inverted-Daylight-Detector-Toggle.patch similarity index 97% rename from CraftBukkit-Patches/0161-Inverted-Daylight-Detector-Toggle.patch rename to CraftBukkit-Patches/0159-Inverted-Daylight-Detector-Toggle.patch index 648383f8f..36d61750f 100644 --- a/CraftBukkit-Patches/0161-Inverted-Daylight-Detector-Toggle.patch +++ b/CraftBukkit-Patches/0159-Inverted-Daylight-Detector-Toggle.patch @@ -1,4 +1,4 @@ -From 41046c8486ca4b85479b214b4907ee8a29d451ee Mon Sep 17 00:00:00 2001 +From 5db9c82f05dfda72ae7d4eaa8466bb7245ca6113 Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 15 Apr 2014 22:57:01 -0700 Subject: [PATCH] Inverted Daylight Detector Toggle diff --git a/CraftBukkit-Patches/0162-Add-1.8-recipes-for-stone-variants.patch b/CraftBukkit-Patches/0160-Add-1.8-recipes-for-stone-variants.patch similarity index 97% rename from CraftBukkit-Patches/0162-Add-1.8-recipes-for-stone-variants.patch rename to CraftBukkit-Patches/0160-Add-1.8-recipes-for-stone-variants.patch index 69699835b..1125e79f8 100644 --- a/CraftBukkit-Patches/0162-Add-1.8-recipes-for-stone-variants.patch +++ b/CraftBukkit-Patches/0160-Add-1.8-recipes-for-stone-variants.patch @@ -1,4 +1,4 @@ -From f7cbdf8fd9cee61da3298cb917e6af0a30900277 Mon Sep 17 00:00:00 2001 +From 149f4e22b7778e9b7de66813968a33f7fd45b4df Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 10 Jun 2014 18:22:19 -0500 Subject: [PATCH] Add 1.8 recipes for stone variants diff --git a/CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch b/CraftBukkit-Patches/0161-Fix-movement-inconsistencies.patch similarity index 97% rename from CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch rename to CraftBukkit-Patches/0161-Fix-movement-inconsistencies.patch index c619bdf4f..452549b4d 100644 --- a/CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch +++ b/CraftBukkit-Patches/0161-Fix-movement-inconsistencies.patch @@ -1,11 +1,11 @@ -From aa51482ccd261d9a7044055016f91a17bdaa5041 Mon Sep 17 00:00:00 2001 +From 5afd50a682f8b729ddcd9d878c9131fee6b19d4a Mon Sep 17 00:00:00 2001 From: Iceee Date: Thu, 12 Jun 2014 03:18:13 -0500 Subject: [PATCH] Fix movement inconsistencies diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 57861a9..2b78287 100644 +index 258bc9d..0ef4c28 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -525,41 +525,85 @@ public abstract class Entity { @@ -58,12 +58,7 @@ index 57861a9..2b78287 100644 + for (j = 0; j < list.size(); ++j) { + d0 = ((AxisAlignedBB) list.get(j)).a(this.boundingBox, d0); + } - -- this.boundingBox.d(0.0D, 0.0D, d2); -- if (!this.J && d8 != d2) { -- d2 = 0.0D; -- d1 = 0.0D; -- d0 = 0.0D; ++ + this.boundingBox.d(d0, 0.0D, 0.0D); + if (!this.J && d6 != d0) { + d2 = 0.0D; @@ -85,7 +80,12 @@ index 57861a9..2b78287 100644 + for (int i = 0; i < list.size(); ++i) { + d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1); + } -+ + +- this.boundingBox.d(0.0D, 0.0D, d2); +- if (!this.J && d8 != d2) { +- d2 = 0.0D; +- d1 = 0.0D; +- d0 = 0.0D; + this.boundingBox.d(0.0D, d1, 0.0D); + if (!this.J && d7 != d1) { + d2 = 0.0D; diff --git a/CraftBukkit-Patches/0164-Fix-redstone-lag-issues.patch b/CraftBukkit-Patches/0162-Fix-redstone-lag-issues.patch similarity index 92% rename from CraftBukkit-Patches/0164-Fix-redstone-lag-issues.patch rename to CraftBukkit-Patches/0162-Fix-redstone-lag-issues.patch index 502c7586d..ee93cc4f0 100644 --- a/CraftBukkit-Patches/0164-Fix-redstone-lag-issues.patch +++ b/CraftBukkit-Patches/0162-Fix-redstone-lag-issues.patch @@ -1,11 +1,11 @@ -From d3407f3fe17439d92a5572137f28120341365618 Mon Sep 17 00:00:00 2001 +From 9302e42ce20dff7b6bc60aa7307b0b8ac0e752a8 Mon Sep 17 00:00:00 2001 From: Iceee Date: Thu, 12 Jun 2014 13:37:35 -0500 Subject: [PATCH] Fix redstone lag issues diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2dc3a13..3a6dea7 100644 +index 8cbfa30..fd7f4bb 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -526,6 +526,7 @@ public class WorldServer extends World { diff --git a/CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch b/CraftBukkit-Patches/0163-Ability-to-disable-asynccatcher.patch similarity index 93% rename from CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch rename to CraftBukkit-Patches/0163-Ability-to-disable-asynccatcher.patch index ad91d0eea..8b40b971f 100644 --- a/CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch +++ b/CraftBukkit-Patches/0163-Ability-to-disable-asynccatcher.patch @@ -1,4 +1,4 @@ -From 66a59ccca452c2b062e5a7651eae0a1c3e80785d Mon Sep 17 00:00:00 2001 +From 140459691f7ede67f6353b55bc4d0ea9e1000b1c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 14 Jun 2014 22:39:58 -0500 Subject: [PATCH] Ability to disable asynccatcher @@ -18,7 +18,7 @@ index 4b3aa85..4c78409 100644 public static void catchOp(String reason) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 5ddd593..1e6544a 100644 +index 1e30d4d..22f39bd 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -324,4 +324,13 @@ public class SpigotConfig