From ce45aa074ed0f57805b182da7a594dd07c042e71 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:32:07 +1000 Subject: [PATCH] Move version resolve check to initial POM patch --- CraftBukkit-Patches/0001-POM-Changes.patch | 15 ++++++++++++- ...sed-to-unload-chunks-for-the-client.patch} | 2 +- ...g-check-to-correctly-resolve-api-ver.patch | 22 ------------------- ...free-but-safe-chunk-reference-cache.patch} | 2 +- ...ation-sleep-for-as-long-as-possible.patch} | 2 +- ...tch => 0014-Improved-Timings-System.patch} | 2 +- ...> 0015-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 => 0018-Entity-Activation-Range.patch} | 2 +- ...the-Metrics-system-to-be-closer-to-.patch} | 2 +- ...hread.patch => 0020-Watchdog-Thread.patch} | 2 +- .../{0022-Netty.patch => 0021-Netty.patch} | 2 +- ...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 => 0027-PlayerItemDamageEvent.patch} | 2 +- ...ch => 0028-Faster-UUID-for-entities.patch} | 2 +- ...ch => 0029-Prevent-NPE-in-CraftSign.patch} | 2 +- ...0-Stage-DataWatcher-WatchableObject.patch} | 2 +- ...atch => 0031-Entity-Tracking-Ranges.patch} | 2 +- ...rt.patch => 0032-BungeeCord-Support.patch} | 2 +- ...ch => 0033-Texture-Pack-Resolutions.patch} | 2 +- ... => 0034-Limit-Custom-Map-Rendering.patch} | 2 +- ...ption-for-disabled-plugin-tasks.-Fi.patch} | 2 +- ...nt-now-can-return-if-the-click-was-.patch} | 2 +- ...> 0037-Enable-Improved-ping-sending.patch} | 2 +- ...t-handshake-spam-from-invalid-names.patch} | 2 +- ...col.patch => 0039-Snapshot-Protocol.patch} | 2 +- ...s-for-randomly-spawned-creatures-to.patch} | 2 +- 32 files changed, 44 insertions(+), 53 deletions(-) rename CraftBukkit-Patches/{0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch => 0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch} (97%) delete mode 100644 CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch rename CraftBukkit-Patches/{0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch => 0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch} (95%) rename CraftBukkit-Patches/{0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch => 0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch} (98%) rename CraftBukkit-Patches/{0015-Improved-Timings-System.patch => 0014-Improved-Timings-System.patch} (99%) rename CraftBukkit-Patches/{0016-Add-oreobfuscator-for-Spigot.patch => 0015-Add-oreobfuscator-for-Spigot.patch} (99%) rename CraftBukkit-Patches/{0017-Only-count-entities-in-chunks-being-processed-for-th.patch => 0016-Only-count-entities-in-chunks-being-processed-for-th.patch} (98%) rename CraftBukkit-Patches/{0018-Detect-remove-and-warn-about-null-tile-entities.patch => 0017-Detect-remove-and-warn-about-null-tile-entities.patch} (94%) rename CraftBukkit-Patches/{0019-Entity-Activation-Range.patch => 0018-Entity-Activation-Range.patch} (99%) rename CraftBukkit-Patches/{0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch => 0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch} (99%) rename CraftBukkit-Patches/{0021-Watchdog-Thread.patch => 0020-Watchdog-Thread.patch} (99%) rename CraftBukkit-Patches/{0022-Netty.patch => 0021-Netty.patch} (99%) rename CraftBukkit-Patches/{0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch => 0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch} (95%) rename CraftBukkit-Patches/{0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch => 0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch} (96%) rename CraftBukkit-Patches/{0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch => 0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch} (96%) rename CraftBukkit-Patches/{0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch => 0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch} (93%) rename CraftBukkit-Patches/{0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch => 0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch} (94%) rename CraftBukkit-Patches/{0028-PlayerItemDamageEvent.patch => 0027-PlayerItemDamageEvent.patch} (97%) rename CraftBukkit-Patches/{0029-Faster-UUID-for-entities.patch => 0028-Faster-UUID-for-entities.patch} (93%) rename CraftBukkit-Patches/{0030-Prevent-NPE-in-CraftSign.patch => 0029-Prevent-NPE-in-CraftSign.patch} (96%) rename CraftBukkit-Patches/{0031-Stage-DataWatcher-WatchableObject.patch => 0030-Stage-DataWatcher-WatchableObject.patch} (99%) rename CraftBukkit-Patches/{0032-Entity-Tracking-Ranges.patch => 0031-Entity-Tracking-Ranges.patch} (99%) rename CraftBukkit-Patches/{0033-BungeeCord-Support.patch => 0032-BungeeCord-Support.patch} (97%) rename CraftBukkit-Patches/{0034-Texture-Pack-Resolutions.patch => 0033-Texture-Pack-Resolutions.patch} (98%) rename CraftBukkit-Patches/{0035-Limit-Custom-Map-Rendering.patch => 0034-Limit-Custom-Map-Rendering.patch} (98%) rename CraftBukkit-Patches/{0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch => 0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch} (95%) rename CraftBukkit-Patches/{0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch => 0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch} (97%) rename CraftBukkit-Patches/{0038-Enable-Improved-ping-sending.patch => 0037-Enable-Improved-ping-sending.patch} (97%) rename CraftBukkit-Patches/{0039-Prevent-handshake-spam-from-invalid-names.patch => 0038-Prevent-handshake-spam-from-invalid-names.patch} (98%) rename CraftBukkit-Patches/{0040-Snapshot-Protocol.patch => 0039-Snapshot-Protocol.patch} (99%) rename CraftBukkit-Patches/{0041-Save-entity-counts-for-randomly-spawned-creatures-to.patch => 0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch} (97%) diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index c9d4f86928..65132c559a 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 6dd764bae1ebff787bcd16c1b055333995c80dbc Mon Sep 17 00:00:00 2001 +From 2f15ef604aa43522676d3a290e8fcdc8357e9a49 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:44:24 +1100 Subject: [PATCH] POM Changes. @@ -116,6 +116,19 @@ index 9ff95c6..da1a0eb 100644 package +diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +index f905d17..9304637 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +@@ -11,7 +11,7 @@ public final class Versioning { + public static String getBukkitVersion() { + String result = "Unknown-Version"; + +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties"); ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties"); + Properties properties = new Properties(); + + if (stream != null) { -- 1.8.2.1 diff --git a/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch similarity index 97% rename from CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch rename to CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch index 50476d3bd4..845e2abcda 100644 --- a/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch +++ b/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch @@ -1,4 +1,4 @@ -From 2fbf5ea63022a8ee60fd687af6b8526fa4e0a759 Mon Sep 17 00:00:00 2001 +From aff3169422b56400dd86e91e6cfff87fb2f8d41a 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/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch b/CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch deleted file mode 100644 index 143e0c2ed9..0000000000 --- a/CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7866a2f38c32cab403554e122670e7c44b97dd14 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Tue, 15 Jan 2013 15:05:02 +1100 -Subject: [PATCH] Update versioning check to correctly resolve api version. - - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index f905d17..9304637 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -@@ -11,7 +11,7 @@ public final class Versioning { - public static String getBukkitVersion() { - String result = "Unknown-Version"; - -- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties"); -+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties"); - Properties properties = new Properties(); - - if (stream != null) { --- -1.8.2.1 - diff --git a/CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch similarity index 95% rename from CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch rename to CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch index a41289fe96..7ac87ba513 100644 --- a/CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch +++ b/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch @@ -1,4 +1,4 @@ -From e5359d2e13ff1b81e120159a27421894c77aec33 Mon Sep 17 00:00:00 2001 +From b70e8e675c6c9b47fc4c4a31d29a27468c3ab974 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/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch similarity index 98% rename from CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch rename to CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch index 00f2b34910..46a45be6d9 100644 --- a/CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch +++ b/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch @@ -1,4 +1,4 @@ -From 4414321e46640b3a33eb118b48589bc2eadd1c56 Mon Sep 17 00:00:00 2001 +From fb71acadb1e590cf6759067258e5f9da22675cf8 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/0015-Improved-Timings-System.patch b/CraftBukkit-Patches/0014-Improved-Timings-System.patch similarity index 99% rename from CraftBukkit-Patches/0015-Improved-Timings-System.patch rename to CraftBukkit-Patches/0014-Improved-Timings-System.patch index 506f3daeeb..0ffa418e4e 100644 --- a/CraftBukkit-Patches/0015-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0014-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From 043b7b77e70022138dcdbaefbd09238b74423fd5 Mon Sep 17 00:00:00 2001 +From 82d081b636d0a51ea6773b49f665863444d9fe52 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/0016-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch similarity index 99% rename from CraftBukkit-Patches/0016-Add-oreobfuscator-for-Spigot.patch rename to CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch index 914fcd6d72..7ebeac2481 100644 --- a/CraftBukkit-Patches/0016-Add-oreobfuscator-for-Spigot.patch +++ b/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch @@ -1,4 +1,4 @@ -From bd36fd8224840874eee255240a95d5838d910737 Mon Sep 17 00:00:00 2001 +From 438a941956c79e8a33f240b32cba493dee72ef2d 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/0017-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch similarity index 98% rename from CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch rename to CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch index a1d00d16b6..49fe78ef01 100644 --- a/CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch +++ b/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch @@ -1,4 +1,4 @@ -From ea8ea5f1b16431f18c66b0ee3fb30fc3cc90d442 Mon Sep 17 00:00:00 2001 +From b1337b27a8444cbd78141b52282f5a2b2986961f 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/0018-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch similarity index 94% rename from CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch rename to CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch index 0aad93a2c9..5f77252b83 100644 --- a/CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch +++ b/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch @@ -1,4 +1,4 @@ -From 7e8c83b9090d0750ea37cdd370904bee216dbb73 Mon Sep 17 00:00:00 2001 +From 3a84358a28ed01c59aa397d8620d382ecb7d3391 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/0019-Entity-Activation-Range.patch b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch similarity index 99% rename from CraftBukkit-Patches/0019-Entity-Activation-Range.patch rename to CraftBukkit-Patches/0018-Entity-Activation-Range.patch index d38c121621..62b16553b8 100644 --- a/CraftBukkit-Patches/0019-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 9e00228efc4dd48b96d8c686fa8d9872ecc4e06b Mon Sep 17 00:00:00 2001 +From b47ddfa47df6df27713074bc7a5ceeb912026ebd 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/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch similarity index 99% rename from CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch rename to CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch index 33d8080523..20d3d1bdd6 100644 --- a/CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch +++ b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch @@ -1,4 +1,4 @@ -From 8a10704aa2e70c5d9d461c892a930dd3ddd6320e Mon Sep 17 00:00:00 2001 +From b34586f9690cc7869fc54917df30d3a0413beff8 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/0021-Watchdog-Thread.patch b/CraftBukkit-Patches/0020-Watchdog-Thread.patch similarity index 99% rename from CraftBukkit-Patches/0021-Watchdog-Thread.patch rename to CraftBukkit-Patches/0020-Watchdog-Thread.patch index 614c379c61..5e6b0762d8 100644 --- a/CraftBukkit-Patches/0021-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0020-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From cc9da81376725d3f41e4b9d7bbdc3147130573d7 Mon Sep 17 00:00:00 2001 +From b23a6f7978ef79948ab15b9126d199df6e5c2865 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/0022-Netty.patch b/CraftBukkit-Patches/0021-Netty.patch similarity index 99% rename from CraftBukkit-Patches/0022-Netty.patch rename to CraftBukkit-Patches/0021-Netty.patch index c75f06b814..8a7eff6311 100644 --- a/CraftBukkit-Patches/0022-Netty.patch +++ b/CraftBukkit-Patches/0021-Netty.patch @@ -1,4 +1,4 @@ -From 937cd2af62e9aba06ca928808b954a967b39e70b Mon Sep 17 00:00:00 2001 +From ae36f22f9f3befe76565e9488da1ed48fe93987a Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 19 Apr 2013 17:44:39 +1000 Subject: [PATCH] Netty diff --git a/CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch rename to CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch index b3b73125c0..d73be1f8db 100644 --- a/CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch +++ b/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch @@ -1,4 +1,4 @@ -From 03871ddf1b79ab43caa4794c84db09148d02250f Mon Sep 17 00:00:00 2001 +From 03988d5e8c3377bf241a8160c1845bbdb9ae0502 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/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch similarity index 96% rename from CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch rename to CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch index 1f2118d8b2..ddabd3c8b9 100644 --- a/CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch +++ b/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch @@ -1,4 +1,4 @@ -From 61fea458560bf9212ba6e67385ff7988972c04c4 Mon Sep 17 00:00:00 2001 +From 1d22c36f1f307d7ea7888e4dd20a4529363f95db 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/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch similarity index 96% rename from CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch rename to CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch index 94ccaedbdd..7435612e3e 100644 --- a/CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch +++ b/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch @@ -1,4 +1,4 @@ -From 1ca8c2db44c9b9dd34db2ac5f36dfaf894b2e0d2 Mon Sep 17 00:00:00 2001 +From afee99028e8ff63527b84091ede331283abc7ef4 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/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch similarity index 93% rename from CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch rename to CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index 06f26b7a70..2422166108 100644 --- a/CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From 50f01906623941eca95bf53adbb7e38de68fbd76 Mon Sep 17 00:00:00 2001 +From 0c7dc7ea5b5965a3cff0317bf90deba48227b61e 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/0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch similarity index 94% rename from CraftBukkit-Patches/0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch rename to CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch index 591df7b251..0cc3fa241c 100644 --- a/CraftBukkit-Patches/0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch +++ b/CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch @@ -1,4 +1,4 @@ -From 963f766cb076e6a8983faaa3a14124369bb5cec7 Mon Sep 17 00:00:00 2001 +From 525421dbffa6016d81331c6c9a1a15be02917865 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/0028-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch similarity index 97% rename from CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch rename to CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch index e4be96f754..2f96f987cd 100644 --- a/CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 069d3b19905fa584a623b36024b5cedadab38718 Mon Sep 17 00:00:00 2001 +From 3078ae0eef8f68ae05ebc2107746ccf6965713cf 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/0029-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch similarity index 93% rename from CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch rename to CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch index 4f293fe047..d236e61370 100644 --- a/CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch +++ b/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch @@ -1,4 +1,4 @@ -From 2b65267bd33de765abe59d7c47e6e7431eea888c Mon Sep 17 00:00:00 2001 +From 90ba774bcafa370b5cd082f0d4aa8a7d717dae1e 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/0030-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch similarity index 96% rename from CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch rename to CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch index 57c8e0008f..20942f84c9 100644 --- a/CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From 856c80c7445ba24d8b55291fa8f7c9dae9dec58b Mon Sep 17 00:00:00 2001 +From bb19263eed54f52fe0b0dd8d8bff649073016fff 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/0031-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch similarity index 99% rename from CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch rename to CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch index 3d11701274..c73ca77dd2 100644 --- a/CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch +++ b/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch @@ -1,4 +1,4 @@ -From 529c96426506d0211e28f6251ddfc705392936fe Mon Sep 17 00:00:00 2001 +From ea0a53558ac6f173d2dae99e1152e8a09b4c083b 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/0032-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch similarity index 99% rename from CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch rename to CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch index e28fdf91f9..08c603821d 100644 --- a/CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 603cd06ab23bd22aaec57f52cafdb62757f528b9 Mon Sep 17 00:00:00 2001 +From 15fc2a6fa3f0ed848e928ff0da1f3a31edaed0c5 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/0033-BungeeCord-Support.patch b/CraftBukkit-Patches/0032-BungeeCord-Support.patch similarity index 97% rename from CraftBukkit-Patches/0033-BungeeCord-Support.patch rename to CraftBukkit-Patches/0032-BungeeCord-Support.patch index c3a720bf8a..fee06deda3 100644 --- a/CraftBukkit-Patches/0033-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0032-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 64db4568e3569988cd08a4e671a05f98b59763a9 Mon Sep 17 00:00:00 2001 +From 54be87d488966a3576c47be9ac175ece46909e8e 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/0034-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch similarity index 98% rename from CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch rename to CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch index dce8fef562..8d48f78430 100644 --- a/CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From 37ac86f0ff79bbfac1afc367b4e99ba681915ff3 Mon Sep 17 00:00:00 2001 +From f3d344a14e5c28ede7d04415149d8277344e5e66 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/0035-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch similarity index 98% rename from CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch rename to CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch index cd1cacd640..aa9d9851bf 100644 --- a/CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch +++ b/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch @@ -1,4 +1,4 @@ -From 7a602b1febd624f603ac40391b3f4d8126f09134 Mon Sep 17 00:00:00 2001 +From 0c5d5c8f8863549c7b36e7d557a76889765f5961 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/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch rename to CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch index ff4a75a615..3f740de70b 100644 --- a/CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch +++ b/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch @@ -1,4 +1,4 @@ -From 2b34f5139b1dbb3c389a3eb525bc83124e911985 Mon Sep 17 00:00:00 2001 +From 4a583d6032b6063f3dccca708faafd27bc0000fb 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/0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch b/CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch similarity index 97% rename from CraftBukkit-Patches/0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch rename to CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch index 27096394bf..286bcbbf99 100644 --- a/CraftBukkit-Patches/0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch +++ b/CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch @@ -1,4 +1,4 @@ -From abac44df8b621da4a7cbb7fbbbebd6a48918a782 Mon Sep 17 00:00:00 2001 +From b14ef0d35041dd0711f8da12b7bc82c544ae1ec9 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/0038-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch similarity index 97% rename from CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch rename to CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch index e66c46ca6c..0d8e5b22b3 100644 --- a/CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From bd5f552eae7391d9c4798d270821d29e337c8e4d Mon Sep 17 00:00:00 2001 +From 3c78de6884305234b68a65f73680907263b66413 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/0039-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch similarity index 98% rename from CraftBukkit-Patches/0039-Prevent-handshake-spam-from-invalid-names.patch rename to CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch index 40cc6635c2..98eb003933 100644 --- a/CraftBukkit-Patches/0039-Prevent-handshake-spam-from-invalid-names.patch +++ b/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch @@ -1,4 +1,4 @@ -From c3e72db478ea4e2b69bee03318be189cb7bc257b Mon Sep 17 00:00:00 2001 +From 54aa49bd3dccd1b9b209cbd4f81b08208d586b3a 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/0040-Snapshot-Protocol.patch b/CraftBukkit-Patches/0039-Snapshot-Protocol.patch similarity index 99% rename from CraftBukkit-Patches/0040-Snapshot-Protocol.patch rename to CraftBukkit-Patches/0039-Snapshot-Protocol.patch index fb03370b49..7ee54c1c1a 100644 --- a/CraftBukkit-Patches/0040-Snapshot-Protocol.patch +++ b/CraftBukkit-Patches/0039-Snapshot-Protocol.patch @@ -1,4 +1,4 @@ -From d504f3069c822a67043c68e27a56a1bdff559266 Mon Sep 17 00:00:00 2001 +From 7a6aea043ba36689910286ee7fbb3dff03766bf9 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/0041-Save-entity-counts-for-randomly-spawned-creatures-to.patch b/CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch similarity index 97% rename from CraftBukkit-Patches/0041-Save-entity-counts-for-randomly-spawned-creatures-to.patch rename to CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch index 6617ee2412..76e6b417b5 100644 --- a/CraftBukkit-Patches/0041-Save-entity-counts-for-randomly-spawned-creatures-to.patch +++ b/CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch @@ -1,4 +1,4 @@ -From 093324f22d92096d4d3e22509a6fef21f47343c8 Mon Sep 17 00:00:00 2001 +From 13861d6edb0b265eb0fe878e06c420495dbd7b53 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