From 6602a253c2c1e3f09d4c05fff06e8719e6a67626 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Mar 2015 18:12:06 +1100 Subject: [PATCH] SPIGOT-660 remove unrequired patch. --- ...I.patch => 0154-BungeeCord-Chat-API.patch} | 2 +- ...-InventoryCloseEvent-Unless-Required.patch | 21 ------------------- ...-Use-Standard-List-for-EntitySlices.patch} | 2 +- ...Allow-Capping-Tile-Entity-Tick-Time.patch} | 2 +- ...stMatches-for-ItemStack-Dirty-Check.patch} | 2 +- 5 files changed, 4 insertions(+), 25 deletions(-) rename CraftBukkit-Patches/{0155-BungeeCord-Chat-API.patch => 0154-BungeeCord-Chat-API.patch} (98%) delete mode 100644 CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch rename CraftBukkit-Patches/{0156-Use-Standard-List-for-EntitySlices.patch => 0155-Use-Standard-List-for-EntitySlices.patch} (98%) rename CraftBukkit-Patches/{0157-Allow-Capping-Tile-Entity-Tick-Time.patch => 0156-Allow-Capping-Tile-Entity-Tick-Time.patch} (98%) rename CraftBukkit-Patches/{0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch => 0157-Use-FastMatches-for-ItemStack-Dirty-Check.patch} (97%) diff --git a/CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0154-BungeeCord-Chat-API.patch similarity index 98% rename from CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch rename to CraftBukkit-Patches/0154-BungeeCord-Chat-API.patch index d895d72a7..da5d0d936 100644 --- a/CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0154-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From be9723d72b54939a82aef0e0d7e3bf466c7b59db Mon Sep 17 00:00:00 2001 +From b64f2429d9125f7543cdc85433411d9dc82e84f1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 13:06:05 +1100 Subject: [PATCH] BungeeCord Chat API diff --git a/CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch b/CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch deleted file mode 100644 index 442fa588d..000000000 --- a/CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch +++ /dev/null @@ -1,21 +0,0 @@ -From b380d4bfcb871cf8c761e4446e5f72fdfb7af0fa Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Tue, 30 Sep 2014 21:49:10 +1000 -Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required - - -diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ed762cd..fd20f9e 100644 ---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -833,6 +833,7 @@ public class CraftEventFactory { - } - - public static void handleInventoryCloseEvent(EntityHuman human) { -+ if (human.activeContainer == human.defaultContainer) return; // Spigot - InventoryCloseEvent event = new InventoryCloseEvent(human.activeContainer.getBukkitView()); - human.world.getServer().getPluginManager().callEvent(event); - human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity()); --- -2.1.0 - diff --git a/CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch similarity index 98% rename from CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch rename to CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch index 46a3961eb..73db8db59 100644 --- a/CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From 8a2d1364f6443c563cf18dc6c29c020f8fd9e286 Mon Sep 17 00:00:00 2001 +From 52f937dd4b3d4cfa5bd12c17bd4b38400459bcef Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:33:36 +1100 Subject: [PATCH] Use Standard List for EntitySlices. diff --git a/CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0156-Allow-Capping-Tile-Entity-Tick-Time.patch similarity index 98% rename from CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch rename to CraftBukkit-Patches/0156-Allow-Capping-Tile-Entity-Tick-Time.patch index 85c265951..40b7cef33 100644 --- a/CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0156-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 18f8cbc694301758d04d4321c51694546bc463db Mon Sep 17 00:00:00 2001 +From bc129e3ad9c9823db73c7c4ade4ca55131b0a5b7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. diff --git a/CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0157-Use-FastMatches-for-ItemStack-Dirty-Check.patch similarity index 97% rename from CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch rename to CraftBukkit-Patches/0157-Use-FastMatches-for-ItemStack-Dirty-Check.patch index b0ae28703..591444212 100644 --- a/CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0157-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From 8c7895c3cc2cd187f7e2a9739654c79a4f6ed28e Mon Sep 17 00:00:00 2001 +From f77927deb4acc0d5f8bf0f4ab833fe8b673b86bd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Feb 2015 12:27:40 +1100 Subject: [PATCH] Use FastMatches for ItemStack Dirty Check