From 12f7c098536b92f77b5a543f5776aef0f26b603b Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 25 Sep 2013 08:49:47 +1000 Subject: [PATCH] Remove update physics patch as it causes issues with physics events --- ...and-Health-for-PlayerConsumeItemEve.patch} | 4 +-- ...te-Physics-When-Updating-Attachables.patch | 33 ------------------- ...atch => 0069-Nerf-Zombie-Lag-Issues.patch} | 2 +- ...BlockEvent-for-Fire-Arrows-hitting-.patch} | 2 +- ...Disabling-of-1.6.3-Structure-Saving.patch} | 2 +- ...ate.patch => 0072-Item-Despawn-Rate.patch} | 2 +- 6 files changed, 6 insertions(+), 39 deletions(-) rename CraftBukkit-Patches/{0069-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch => 0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch} (91%) delete mode 100644 CraftBukkit-Patches/0068-Update-Physics-When-Updating-Attachables.patch rename CraftBukkit-Patches/{0070-Nerf-Zombie-Lag-Issues.patch => 0069-Nerf-Zombie-Lag-Issues.patch} (98%) rename CraftBukkit-Patches/{0071-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch => 0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch} (96%) rename CraftBukkit-Patches/{0072-Allow-Disabling-of-1.6.3-Structure-Saving.patch => 0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch} (97%) rename CraftBukkit-Patches/{0073-Item-Despawn-Rate.patch => 0072-Item-Despawn-Rate.patch} (95%) diff --git a/CraftBukkit-Patches/0069-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch similarity index 91% rename from CraftBukkit-Patches/0069-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch rename to CraftBukkit-Patches/0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index b319183e8..de0e5ebdf 100644 --- a/CraftBukkit-Patches/0069-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,11 +1,11 @@ -From 24b94662ec7f7cc5a9f7d953494ecfbbdb391035 Mon Sep 17 00:00:00 2001 +From 2a1df2a53ded142a68685920c5a738696c186543 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 14 Sep 2013 10:16:38 +1000 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0a35df8..e3c4d8c 100644 +index b180933..36eca0f 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -258,6 +258,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen diff --git a/CraftBukkit-Patches/0068-Update-Physics-When-Updating-Attachables.patch b/CraftBukkit-Patches/0068-Update-Physics-When-Updating-Attachables.patch deleted file mode 100644 index 7be7026e9..000000000 --- a/CraftBukkit-Patches/0068-Update-Physics-When-Updating-Attachables.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4715cecf8a6aca768fa90a38c78469cf1016eb6b Mon Sep 17 00:00:00 2001 -From: Chad Waters -Date: Tue, 26 Mar 2013 07:47:43 -0400 -Subject: [PATCH] Update Physics When Updating Attachables - -Update physics for Attachable to update redstone. Fixes BUKKIT-1858 - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -index 2072db2..c2ccc73 100644 ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -@@ -9,6 +9,7 @@ import org.bukkit.block.BlockState; - import org.bukkit.craftbukkit.CraftChunk; - import org.bukkit.craftbukkit.CraftWorld; - import org.bukkit.material.MaterialData; -+import org.bukkit.material.Attachable; - import org.bukkit.metadata.MetadataValue; - import org.bukkit.plugin.Plugin; - -@@ -128,6 +129,10 @@ public class CraftBlockState implements BlockState { - } - - block.setData(getRawData(), applyPhysics); -+ if (applyPhysics && data instanceof Attachable) { -+ Block rel = block.getRelative(((Attachable) data).getFacing(), -1); -+ world.getHandle().applyPhysics(rel.getX(), rel.getY(), rel.getZ(), block.getTypeId()); -+ } - world.getHandle().notify(x, y, z); - - return true; --- -1.8.1.2 - diff --git a/CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch b/CraftBukkit-Patches/0069-Nerf-Zombie-Lag-Issues.patch similarity index 98% rename from CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch rename to CraftBukkit-Patches/0069-Nerf-Zombie-Lag-Issues.patch index a82659719..afa50b6b6 100644 --- a/CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch +++ b/CraftBukkit-Patches/0069-Nerf-Zombie-Lag-Issues.patch @@ -1,4 +1,4 @@ -From 6649bf8e5ea40c1620570364905bb6d8deabbfa8 Mon Sep 17 00:00:00 2001 +From f0fcf1cdd831dea90719d24c8f8f48ea18c14863 Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Sat, 14 Sep 2013 11:02:34 +1000 Subject: [PATCH] Nerf Zombie Lag Issues diff --git a/CraftBukkit-Patches/0071-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch similarity index 96% rename from CraftBukkit-Patches/0071-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch rename to CraftBukkit-Patches/0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index 253839602..1588e2215 100644 --- a/CraftBukkit-Patches/0071-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From cacda76247284c121897d7db87e42868b7cf5377 Mon Sep 17 00:00:00 2001 +From 5c0b8ad4ee0045477c67c6d6e37ae77bffaf4972 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Tue, 16 Jul 2013 22:34:50 +0200 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT diff --git a/CraftBukkit-Patches/0072-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch similarity index 97% rename from CraftBukkit-Patches/0072-Allow-Disabling-of-1.6.3-Structure-Saving.patch rename to CraftBukkit-Patches/0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch index 3c6f1d1e3..34ee3010f 100644 --- a/CraftBukkit-Patches/0072-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From 79440ab42fc945d2efec96be6ec3bb7667c18e71 Mon Sep 17 00:00:00 2001 +From 7463a7f6ab3c97b4b4f5a7b4b6f2acbe5de1d091 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 21 Sep 2013 12:33:09 +1000 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving diff --git a/CraftBukkit-Patches/0073-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0072-Item-Despawn-Rate.patch similarity index 95% rename from CraftBukkit-Patches/0073-Item-Despawn-Rate.patch rename to CraftBukkit-Patches/0072-Item-Despawn-Rate.patch index 4236cbb9d..5bb09e0d0 100644 --- a/CraftBukkit-Patches/0073-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0072-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From a506a78c0160d17ca9b1a9e8fcaa17718a2e7678 Mon Sep 17 00:00:00 2001 +From 249bb1fac815a77925401bfdf3c05d96f78df47c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate