From 18520d21b210e7fd398d1486264701c508c64f2d Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:37:51 +1000 Subject: [PATCH] Remove extra inventory close event patch, because despite being a legitimate bug fix, it will not be pulled by Bukkit, so plugins must resort to other means to catch this last event. --- ...286-by-firing-the-inventory-close-ev.patch | 40 ------------------- ...ing-of-NibbleArrays-only-allocate-b.patch} | 2 +- ...sed-to-unload-chunks-for-the-client.patch} | 2 +- ...free-but-safe-chunk-reference-cache.patch} | 2 +- ...ation-sleep-for-as-long-as-possible.patch} | 2 +- ...tch => 0013-Improved-Timings-System.patch} | 2 +- ...> 0014-Add-oreobfuscator-for-Spigot.patch} | 2 +- ...es-in-chunks-being-processed-for-th.patch} | 2 +- ...e-and-warn-about-null-tile-entities.patch} | 2 +- ...tch => 0017-Entity-Activation-Range.patch} | 2 +- ...the-Metrics-system-to-be-closer-to-.patch} | 2 +- ...hread.patch => 0019-Watchdog-Thread.patch} | 2 +- .../{0021-Netty.patch => 0020-Netty.patch} | 4 +- ...on-itself-instead-of-next-to-bed-Fi.patch} | 2 +- ...-on-CraftPlayer.getBedSpawnLocation.patch} | 2 +- ...-missing-HangingBreakEvent-when-Ent.patch} | 2 +- ...3667-Faux-sleepers-wake-up-normally.patch} | 2 +- ...rong-block-in-BlockDispenseEvent-wh.patch} | 2 +- ...patch => 0026-PlayerItemDamageEvent.patch} | 2 +- ...ch => 0027-Faster-UUID-for-entities.patch} | 2 +- ...ch => 0028-Prevent-NPE-in-CraftSign.patch} | 2 +- ...9-Stage-DataWatcher-WatchableObject.patch} | 2 +- ...atch => 0030-Entity-Tracking-Ranges.patch} | 2 +- ...rt.patch => 0031-BungeeCord-Support.patch} | 2 +- ...ch => 0032-Texture-Pack-Resolutions.patch} | 2 +- ... => 0033-Limit-Custom-Map-Rendering.patch} | 2 +- ...ption-for-disabled-plugin-tasks.-Fi.patch} | 2 +- ...nt-now-can-return-if-the-click-was-.patch} | 2 +- ...> 0036-Enable-Improved-ping-sending.patch} | 2 +- ...t-handshake-spam-from-invalid-names.patch} | 2 +- ...col.patch => 0038-Snapshot-Protocol.patch} | 2 +- ...s-for-randomly-spawned-creatures-to.patch} | 2 +- 32 files changed, 32 insertions(+), 72 deletions(-) delete mode 100644 CraftBukkit-Patches/0009-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch rename CraftBukkit-Patches/{0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch => 0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch} (99%) rename CraftBukkit-Patches/{0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch => 0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch} (97%) rename CraftBukkit-Patches/{0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch => 0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch} (95%) rename CraftBukkit-Patches/{0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch => 0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch} (98%) rename CraftBukkit-Patches/{0014-Improved-Timings-System.patch => 0013-Improved-Timings-System.patch} (99%) rename CraftBukkit-Patches/{0015-Add-oreobfuscator-for-Spigot.patch => 0014-Add-oreobfuscator-for-Spigot.patch} (99%) rename CraftBukkit-Patches/{0016-Only-count-entities-in-chunks-being-processed-for-th.patch => 0015-Only-count-entities-in-chunks-being-processed-for-th.patch} (98%) rename CraftBukkit-Patches/{0017-Detect-remove-and-warn-about-null-tile-entities.patch => 0016-Detect-remove-and-warn-about-null-tile-entities.patch} (94%) rename CraftBukkit-Patches/{0018-Entity-Activation-Range.patch => 0017-Entity-Activation-Range.patch} (99%) rename CraftBukkit-Patches/{0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch => 0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch} (99%) rename CraftBukkit-Patches/{0020-Watchdog-Thread.patch => 0019-Watchdog-Thread.patch} (99%) rename CraftBukkit-Patches/{0021-Netty.patch => 0020-Netty.patch} (99%) rename CraftBukkit-Patches/{0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch => 0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch} (95%) rename CraftBukkit-Patches/{0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch => 0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch} (96%) rename CraftBukkit-Patches/{0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch => 0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch} (96%) rename CraftBukkit-Patches/{0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch => 0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch} (93%) rename CraftBukkit-Patches/{0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch => 0025-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch} (94%) rename CraftBukkit-Patches/{0027-PlayerItemDamageEvent.patch => 0026-PlayerItemDamageEvent.patch} (97%) rename CraftBukkit-Patches/{0028-Faster-UUID-for-entities.patch => 0027-Faster-UUID-for-entities.patch} (93%) rename CraftBukkit-Patches/{0029-Prevent-NPE-in-CraftSign.patch => 0028-Prevent-NPE-in-CraftSign.patch} (96%) rename CraftBukkit-Patches/{0030-Stage-DataWatcher-WatchableObject.patch => 0029-Stage-DataWatcher-WatchableObject.patch} (99%) rename CraftBukkit-Patches/{0031-Entity-Tracking-Ranges.patch => 0030-Entity-Tracking-Ranges.patch} (99%) rename CraftBukkit-Patches/{0032-BungeeCord-Support.patch => 0031-BungeeCord-Support.patch} (97%) rename CraftBukkit-Patches/{0033-Texture-Pack-Resolutions.patch => 0032-Texture-Pack-Resolutions.patch} (98%) rename CraftBukkit-Patches/{0034-Limit-Custom-Map-Rendering.patch => 0033-Limit-Custom-Map-Rendering.patch} (98%) rename CraftBukkit-Patches/{0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch => 0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch} (95%) rename CraftBukkit-Patches/{0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch => 0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch} (97%) rename CraftBukkit-Patches/{0037-Enable-Improved-ping-sending.patch => 0036-Enable-Improved-ping-sending.patch} (97%) rename CraftBukkit-Patches/{0038-Prevent-handshake-spam-from-invalid-names.patch => 0037-Prevent-handshake-spam-from-invalid-names.patch} (98%) rename CraftBukkit-Patches/{0039-Snapshot-Protocol.patch => 0038-Snapshot-Protocol.patch} (99%) rename CraftBukkit-Patches/{0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch => 0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch} (97%) diff --git a/CraftBukkit-Patches/0009-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch b/CraftBukkit-Patches/0009-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch deleted file mode 100644 index e92ef000a8..0000000000 --- a/CraftBukkit-Patches/0009-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b310fa74d48b5a1f347cfbe393f5eb0ea1f14a0e Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Sun, 23 Dec 2012 17:09:40 +1100 -Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when - a secondary container is closed due to the player entity being destroyed. - This covers all edge cases such as server stop / player kick / player quit. - - -diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index d647d2e..f948497 100644 ---- a/src/main/java/net/minecraft/server/EntityHuman.java -+++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -5,11 +5,13 @@ import java.util.Iterator; - import java.util.List; - - // CraftBukkit start -+import org.bukkit.Bukkit; - import org.bukkit.craftbukkit.entity.CraftHumanEntity; - import org.bukkit.craftbukkit.entity.CraftItem; - import org.bukkit.craftbukkit.inventory.CraftItemStack; - import org.bukkit.entity.Player; - import org.bukkit.event.entity.EntityCombustByEntityEvent; -+import org.bukkit.event.inventory.InventoryCloseEvent; - import org.bukkit.event.player.PlayerBedEnterEvent; - import org.bukkit.event.player.PlayerBedLeaveEvent; - import org.bukkit.event.player.PlayerDropItemEvent; -@@ -961,6 +963,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen - super.die(); - this.defaultContainer.b(this); - if (this.activeContainer != null) { -+ // CraftBukkit start -+ InventoryCloseEvent event = new InventoryCloseEvent(this.activeContainer.getBukkitView()); -+ Bukkit.getServer().getPluginManager().callEvent(event); -+ // CraftBukkit end - this.activeContainer.b(this); - } - } --- -1.8.2.1 - diff --git a/CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch similarity index 99% rename from CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch rename to CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch index d02e570a41..1762138e81 100644 --- a/CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch +++ b/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch @@ -1,4 +1,4 @@ -From d84c1f7342f30987a074d105d4d8ba1a510cbfcf Mon Sep 17 00:00:00 2001 +From c049344dec44e8f266b1f692fd9384936911c826 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 13 Jan 2013 03:49:07 -0800 Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate diff --git a/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch similarity index 97% rename from CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch rename to CraftBukkit-Patches/0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch index 845e2abcda..58ee97e4fe 100644 --- a/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch +++ b/CraftBukkit-Patches/0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch @@ -1,4 +1,4 @@ -From aff3169422b56400dd86e91e6cfff87fb2f8d41a Mon Sep 17 00:00:00 2001 +From 9542a9f8645de176e39d33694e930872ee7a42d8 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Fri, 18 Jan 2013 16:20:01 +0500 Subject: [PATCH] Optimize packet used to unload chunks for the client diff --git a/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch similarity index 95% rename from CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch rename to CraftBukkit-Patches/0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch index 7ac87ba513..d40494a7c4 100644 --- a/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch +++ b/CraftBukkit-Patches/0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch @@ -1,4 +1,4 @@ -From b70e8e675c6c9b47fc4c4a31d29a27468c3ab974 Mon Sep 17 00:00:00 2001 +From 6591b85a8d8dba678747feafc3e0bcec83bd6979 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 16 Jan 2013 15:27:22 -0600 Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache diff --git a/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch similarity index 98% rename from CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch rename to CraftBukkit-Patches/0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch index 46a45be6d9..7f017acef0 100644 --- a/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch +++ b/CraftBukkit-Patches/0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch @@ -1,4 +1,4 @@ -From fb71acadb1e590cf6759067258e5f9da22675cf8 Mon Sep 17 00:00:00 2001 +From e39a30a154d3dfe558935df053cd854ed66b184a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 12:28:17 +1100 Subject: [PATCH] Tick loop optimization - sleep for as long as possible. diff --git a/CraftBukkit-Patches/0014-Improved-Timings-System.patch b/CraftBukkit-Patches/0013-Improved-Timings-System.patch similarity index 99% rename from CraftBukkit-Patches/0014-Improved-Timings-System.patch rename to CraftBukkit-Patches/0013-Improved-Timings-System.patch index 0ffa418e4e..11056f4dfe 100644 --- a/CraftBukkit-Patches/0014-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0013-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From 82d081b636d0a51ea6773b49f665863444d9fe52 Mon Sep 17 00:00:00 2001 +From 41be88f8ac09bd5c654ed1d413da940966f355d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Improved Timings System diff --git a/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0014-Add-oreobfuscator-for-Spigot.patch similarity index 99% rename from CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch rename to CraftBukkit-Patches/0014-Add-oreobfuscator-for-Spigot.patch index 7ebeac2481..4dc59828b9 100644 --- a/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch +++ b/CraftBukkit-Patches/0014-Add-oreobfuscator-for-Spigot.patch @@ -1,4 +1,4 @@ -From 438a941956c79e8a33f240b32cba493dee72ef2d Mon Sep 17 00:00:00 2001 +From 1155f9606b7e8061b1ab5c19910133f7a0b40192 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 10:58:17 +1100 Subject: [PATCH] Add oreobfuscator for Spigot. diff --git a/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0015-Only-count-entities-in-chunks-being-processed-for-th.patch similarity index 98% rename from CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch rename to CraftBukkit-Patches/0015-Only-count-entities-in-chunks-being-processed-for-th.patch index 49fe78ef01..b1bb30efb9 100644 --- a/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch +++ b/CraftBukkit-Patches/0015-Only-count-entities-in-chunks-being-processed-for-th.patch @@ -1,4 +1,4 @@ -From b1337b27a8444cbd78141b52282f5a2b2986961f Mon Sep 17 00:00:00 2001 +From bfbd9c222d0c5d8169ea3545e05c318e42835dd3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Jan 2013 13:25:53 -0500 Subject: [PATCH] Only count entities in chunks being processed for the spawn diff --git a/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0016-Detect-remove-and-warn-about-null-tile-entities.patch similarity index 94% rename from CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch rename to CraftBukkit-Patches/0016-Detect-remove-and-warn-about-null-tile-entities.patch index 5f77252b83..707c66988d 100644 --- a/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch +++ b/CraftBukkit-Patches/0016-Detect-remove-and-warn-about-null-tile-entities.patch @@ -1,4 +1,4 @@ -From 3a84358a28ed01c59aa397d8620d382ecb7d3391 Mon Sep 17 00:00:00 2001 +From 640e63f7708ad09e2a48f86cbd94692d5bd12094 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Detect, remove and warn about null tile entities. diff --git a/CraftBukkit-Patches/0018-Entity-Activation-Range.patch b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch similarity index 99% rename from CraftBukkit-Patches/0018-Entity-Activation-Range.patch rename to CraftBukkit-Patches/0017-Entity-Activation-Range.patch index 62b16553b8..d478fe43dd 100644 --- a/CraftBukkit-Patches/0018-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From b47ddfa47df6df27713074bc7a5ceeb912026ebd Mon Sep 17 00:00:00 2001 +From 652752f24fa214ce92cdb698689df4d5dc7b1e6c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range diff --git a/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch similarity index 99% rename from CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch rename to CraftBukkit-Patches/0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch index 20d3d1bdd6..2730f2f6b3 100644 --- a/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch +++ b/CraftBukkit-Patches/0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch @@ -1,4 +1,4 @@ -From b34586f9690cc7869fc54917df30d3a0413beff8 Mon Sep 17 00:00:00 2001 +From c5c660bfcf54efd713bb1bb241cc1acdb294e126 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the diff --git a/CraftBukkit-Patches/0020-Watchdog-Thread.patch b/CraftBukkit-Patches/0019-Watchdog-Thread.patch similarity index 99% rename from CraftBukkit-Patches/0020-Watchdog-Thread.patch rename to CraftBukkit-Patches/0019-Watchdog-Thread.patch index 5e6b0762d8..e4daa7f776 100644 --- a/CraftBukkit-Patches/0020-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0019-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From b23a6f7978ef79948ab15b9126d199df6e5c2865 Mon Sep 17 00:00:00 2001 +From f6790305aeed1bb428e4e666a078fb68482bf3b1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. diff --git a/CraftBukkit-Patches/0021-Netty.patch b/CraftBukkit-Patches/0020-Netty.patch similarity index 99% rename from CraftBukkit-Patches/0021-Netty.patch rename to CraftBukkit-Patches/0020-Netty.patch index 8a7eff6311..77460079bf 100644 --- a/CraftBukkit-Patches/0021-Netty.patch +++ b/CraftBukkit-Patches/0020-Netty.patch @@ -1,4 +1,4 @@ -From ae36f22f9f3befe76565e9488da1ed48fe93987a Mon Sep 17 00:00:00 2001 +From 37052de31a36a7565122c58b9fe743dc2a046e45 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 19 Apr 2013 17:44:39 +1000 Subject: [PATCH] Netty @@ -32,7 +32,7 @@ Subject: [PATCH] Netty Commons Attribution-ShareAlike 3.0 Unported license. diff --git a/pom.xml b/pom.xml -index da1a0eb..b8c24af 100644 +index 3e02cc3..f2b6e35 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,11 @@ diff --git a/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch rename to CraftBukkit-Patches/0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch index d73be1f8db..6e16b6dc18 100644 --- a/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch +++ b/CraftBukkit-Patches/0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch @@ -1,4 +1,4 @@ -From 03988d5e8c3377bf241a8160c1845bbdb9ae0502 Mon Sep 17 00:00:00 2001 +From 6ba8ff41998d09eba7c4ae798d27c21ff1fd5762 Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Fri, 22 Feb 2013 09:23:51 -0700 Subject: [PATCH] Return bed location itself instead of next to bed; Fixes diff --git a/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch similarity index 96% rename from CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch rename to CraftBukkit-Patches/0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch index ddabd3c8b9..0a7cac7309 100644 --- a/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch +++ b/CraftBukkit-Patches/0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch @@ -1,4 +1,4 @@ -From 1d22c36f1f307d7ea7888e4dd20a4529363f95db Mon Sep 17 00:00:00 2001 +From 437f4f06845834005b4f6a4b29e6dfb48dc43e12 Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Tue, 12 Feb 2013 16:17:31 -0700 Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes diff --git a/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch similarity index 96% rename from CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch rename to CraftBukkit-Patches/0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch index 7435612e3e..ba3c9e02fb 100644 --- a/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch +++ b/CraftBukkit-Patches/0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch @@ -1,4 +1,4 @@ -From afee99028e8ff63527b84091ede331283abc7ef4 Mon Sep 17 00:00:00 2001 +From bfca37c383ed00f8bd8bc0bc7d6ef8cbb88a8956 Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Sat, 2 Mar 2013 09:36:52 +1100 Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when diff --git a/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch similarity index 93% rename from CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch rename to CraftBukkit-Patches/0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index 2422166108..25fe91923c 100644 --- a/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From 0c7dc7ea5b5965a3cff0317bf90deba48227b61e Mon Sep 17 00:00:00 2001 +From c68181f54fb20ca5f5cd49bc8a9b43924171ab9d Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Mon, 25 Feb 2013 22:26:36 +0200 Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally diff --git a/CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0025-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch similarity index 94% rename from CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch rename to CraftBukkit-Patches/0025-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch index 0cc3fa241c..994e567f7b 100644 --- a/CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch +++ b/CraftBukkit-Patches/0025-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch @@ -1,4 +1,4 @@ -From 525421dbffa6016d81331c6c9a1a15be02917865 Mon Sep 17 00:00:00 2001 +From c542317812b69c939334e3fd219fc21285e63138 Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Tue, 26 Feb 2013 20:14:34 +0200 Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when diff --git a/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch similarity index 97% rename from CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch rename to CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch index 2f96f987cd..f957300caf 100644 --- a/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 3078ae0eef8f68ae05ebc2107746ccf6965713cf Mon Sep 17 00:00:00 2001 +From ce904408636bb5118204626e7d83403be27e7aa6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch similarity index 93% rename from CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch rename to CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch index d236e61370..8409bfd422 100644 --- a/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch +++ b/CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch @@ -1,4 +1,4 @@ -From 90ba774bcafa370b5cd082f0d4aa8a7d717dae1e Mon Sep 17 00:00:00 2001 +From 5e437957841f72b02e11b9c257a5ac419aa5f43e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 17 Mar 2013 19:02:50 +1100 Subject: [PATCH] Faster UUID for entities diff --git a/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch similarity index 96% rename from CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch rename to CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch index 20942f84c9..d2e080a43b 100644 --- a/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From bb19263eed54f52fe0b0dd8d8bff649073016fff Mon Sep 17 00:00:00 2001 +From 38e8948efeb9bf5b95d30e2ccf13ee16787bf257 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0029-Stage-DataWatcher-WatchableObject.patch similarity index 99% rename from CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch rename to CraftBukkit-Patches/0029-Stage-DataWatcher-WatchableObject.patch index c73ca77dd2..81bb84b609 100644 --- a/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch +++ b/CraftBukkit-Patches/0029-Stage-DataWatcher-WatchableObject.patch @@ -1,4 +1,4 @@ -From ea0a53558ac6f173d2dae99e1152e8a09b4c083b Mon Sep 17 00:00:00 2001 +From f150656dd050bd27cf973319921bd5edaeb445ef Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 21 Mar 2013 17:00:54 +1100 Subject: [PATCH] Stage DataWatcher & WatchableObject. diff --git a/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch similarity index 99% rename from CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch rename to CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch index 08c603821d..6eaa7b7303 100644 --- a/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 15fc2a6fa3f0ed848e928ff0da1f3a31edaed0c5 Mon Sep 17 00:00:00 2001 +From facb4f20791fa2f225e3dc727923035bfebb8b09 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0032-BungeeCord-Support.patch b/CraftBukkit-Patches/0031-BungeeCord-Support.patch similarity index 97% rename from CraftBukkit-Patches/0032-BungeeCord-Support.patch rename to CraftBukkit-Patches/0031-BungeeCord-Support.patch index fee06deda3..8bdfa3c33b 100644 --- a/CraftBukkit-Patches/0032-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0031-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 54be87d488966a3576c47be9ac175ece46909e8e Mon Sep 17 00:00:00 2001 +From b2c322170b2b5d4b0f25680bd1f63592a3cdee43 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support diff --git a/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch similarity index 98% rename from CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch rename to CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch index 8d48f78430..e76a0f1ca1 100644 --- a/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From f3d344a14e5c28ede7d04415149d8277344e5e66 Mon Sep 17 00:00:00 2001 +From a4e6123ad2e10c7aa69cd196913c9decc4390472 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 13:04:45 +1100 Subject: [PATCH] Texture Pack Resolutions diff --git a/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0033-Limit-Custom-Map-Rendering.patch similarity index 98% rename from CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch rename to CraftBukkit-Patches/0033-Limit-Custom-Map-Rendering.patch index aa9d9851bf..183afde1ff 100644 --- a/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch +++ b/CraftBukkit-Patches/0033-Limit-Custom-Map-Rendering.patch @@ -1,4 +1,4 @@ -From 0c5d5c8f8863549c7b36e7d557a76889765f5961 Mon Sep 17 00:00:00 2001 +From 2ef5eefd8a0c8d7cd62ac2e06125498151e82cf8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 19:08:41 +1100 Subject: [PATCH] Limit Custom Map Rendering diff --git a/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch rename to CraftBukkit-Patches/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch index 3f740de70b..81257d0514 100644 --- a/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch +++ b/CraftBukkit-Patches/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch @@ -1,4 +1,4 @@ -From 4a583d6032b6063f3dccca708faafd27bc0000fb Mon Sep 17 00:00:00 2001 +From 069d9d32aa69bf222282dd892c5948394905defd Mon Sep 17 00:00:00 2001 From: Hudson Date: Wed, 3 Apr 2013 02:16:56 -0500 Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes diff --git a/CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch b/CraftBukkit-Patches/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch similarity index 97% rename from CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch rename to CraftBukkit-Patches/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch index 286bcbbf99..5a2a8aacd4 100644 --- a/CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch +++ b/CraftBukkit-Patches/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch @@ -1,4 +1,4 @@ -From b14ef0d35041dd0711f8da12b7bc82c544ae1ec9 Mon Sep 17 00:00:00 2001 +From d7e2842e4c89045f0f2eed6ac58a6326daa905d0 Mon Sep 17 00:00:00 2001 From: Tyler Blair Date: Tue, 9 Apr 2013 17:55:15 -0300 Subject: [PATCH] InventoryClickEvent now can return if the click was a double diff --git a/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch similarity index 97% rename from CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch rename to CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch index 0d8e5b22b3..e6d3e0e4da 100644 --- a/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From 3c78de6884305234b68a65f73680907263b66413 Mon Sep 17 00:00:00 2001 +From d419dd29e1778c4858269b2f6bfd002387285673 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending diff --git a/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch similarity index 98% rename from CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch rename to CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch index 98eb003933..7d17a44522 100644 --- a/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch +++ b/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch @@ -1,4 +1,4 @@ -From 54aa49bd3dccd1b9b209cbd4f81b08208d586b3a Mon Sep 17 00:00:00 2001 +From eba3ae1b89ac9d2387bf6cc2be735a2f30806ee1 Mon Sep 17 00:00:00 2001 From: Benjamin James Harrison-Sims Date: Sun, 14 Apr 2013 21:19:57 +0500 Subject: [PATCH] Prevent handshake spam from invalid names. diff --git a/CraftBukkit-Patches/0039-Snapshot-Protocol.patch b/CraftBukkit-Patches/0038-Snapshot-Protocol.patch similarity index 99% rename from CraftBukkit-Patches/0039-Snapshot-Protocol.patch rename to CraftBukkit-Patches/0038-Snapshot-Protocol.patch index 7ee54c1c1a..7c41801dcd 100644 --- a/CraftBukkit-Patches/0039-Snapshot-Protocol.patch +++ b/CraftBukkit-Patches/0038-Snapshot-Protocol.patch @@ -1,4 +1,4 @@ -From 7a6aea043ba36689910286ee7fbb3dff03766bf9 Mon Sep 17 00:00:00 2001 +From cea8e2c5e01c5b382f91b906f442738f9389c7b9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 19 Apr 2013 19:13:42 +1000 Subject: [PATCH] Snapshot Protocol diff --git a/CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch b/CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch similarity index 97% rename from CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch rename to CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch index 76e6b417b5..67d11cb794 100644 --- a/CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch +++ b/CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch @@ -1,4 +1,4 @@ -From 13861d6edb0b265eb0fe878e06c420495dbd7b53 Mon Sep 17 00:00:00 2001 +From f40950506177bd7115bfacfbb892e698e1ea7775 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Sat, 20 Apr 2013 12:26:20 +0500 Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid