diff --git a/CraftBukkit-Patches/0033-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0032-Enable-Improved-Ping-Sending.patch similarity index 97% rename from CraftBukkit-Patches/0033-Enable-Improved-Ping-Sending.patch rename to CraftBukkit-Patches/0032-Enable-Improved-Ping-Sending.patch index 3577f9ff94..d9132419a2 100644 --- a/CraftBukkit-Patches/0033-Enable-Improved-Ping-Sending.patch +++ b/CraftBukkit-Patches/0032-Enable-Improved-Ping-Sending.patch @@ -1,4 +1,4 @@ -From de9ad985c0772ebe1ab6eb22283e76100119adf0 Mon Sep 17 00:00:00 2001 +From 093c26055d78b7e52e6653e47dc73ae765decf5c 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/0032-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0032-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch deleted file mode 100644 index f3ef09c17e..0000000000 --- a/CraftBukkit-Patches/0032-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 002897e8a239938b0a072e9c89ecc2dc39e88a1c 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 - BUKKIT-3951" - -This reverts commit 052e955ed71a30516a5e9cfd76649daaba4ae7d8. - -diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 84dcfcc..0a5c61a 100644 ---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference; - import java.util.logging.Level; - - import org.apache.commons.lang.Validate; --import org.bukkit.plugin.IllegalPluginAccessException; - import org.bukkit.plugin.Plugin; - import org.bukkit.scheduler.BukkitScheduler; - import org.bukkit.scheduler.BukkitTask; -@@ -390,9 +389,6 @@ public class CraftScheduler implements BukkitScheduler { - private static void validate(final Plugin plugin, final Object task) { - Validate.notNull(plugin, "Plugin cannot be null"); - Validate.notNull(task, "Task cannot be null"); -- if (!plugin.isEnabled()) { -- throw new IllegalPluginAccessException("Plugin attempted to register task while disabled"); -- } - } - - private int nextId() { --- -1.8.1.2 - diff --git a/CraftBukkit-Patches/0034-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0033-Prevent-handshake-spam-from-invalid-names.patch similarity index 94% rename from CraftBukkit-Patches/0034-Prevent-handshake-spam-from-invalid-names.patch rename to CraftBukkit-Patches/0033-Prevent-handshake-spam-from-invalid-names.patch index cea82b6d77..a17b54a9e3 100644 --- a/CraftBukkit-Patches/0034-Prevent-handshake-spam-from-invalid-names.patch +++ b/CraftBukkit-Patches/0033-Prevent-handshake-spam-from-invalid-names.patch @@ -1,4 +1,4 @@ -From 81f21d28642e50e9fae1f7feadbb2882e7820f40 Mon Sep 17 00:00:00 2001 +From 2fd3ed6ad7d63cdd7ada4ea8a3b3c57e8881e003 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/0035-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0034-Thread-Naming-and-Tweaks.patch similarity index 95% rename from CraftBukkit-Patches/0035-Thread-Naming-and-Tweaks.patch rename to CraftBukkit-Patches/0034-Thread-Naming-and-Tweaks.patch index de3186c86d..a221cf1224 100644 --- a/CraftBukkit-Patches/0035-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0034-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From 53d53552c6ef582d5116ed29763c7e75087b3912 Mon Sep 17 00:00:00 2001 +From 3ffe256945a7df36f9b9fe08be2b44547d8e9c14 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:50:27 +1000 Subject: [PATCH] Thread Naming and Tweaks @@ -43,10 +43,10 @@ index a4eae65..496cfe4 100644 // CraftBukkit end this.pendingConnection = pendingconnection; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 0a5c61a..35badf3 100644 +index 84dcfcc..a30f217 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -70,7 +70,7 @@ public class CraftScheduler implements BukkitScheduler { +@@ -71,7 +71,7 @@ public class CraftScheduler implements BukkitScheduler { */ private final ConcurrentHashMap runners = new ConcurrentHashMap(); private volatile int currentTick = -1; diff --git a/CraftBukkit-Patches/0036-Close-Unloaded-World-s-Save-Files.patch b/CraftBukkit-Patches/0035-Close-Unloaded-World-s-Save-Files.patch similarity index 97% rename from CraftBukkit-Patches/0036-Close-Unloaded-World-s-Save-Files.patch rename to CraftBukkit-Patches/0035-Close-Unloaded-World-s-Save-Files.patch index cf9fd3a35b..d7a0ffd724 100644 --- a/CraftBukkit-Patches/0036-Close-Unloaded-World-s-Save-Files.patch +++ b/CraftBukkit-Patches/0035-Close-Unloaded-World-s-Save-Files.patch @@ -1,4 +1,4 @@ -From b7b4d3fffc0fbf57e0a1d65d839fefc7a304cc74 Mon Sep 17 00:00:00 2001 +From 961f5828c4eff61d46057d9c5da25fbd636a8519 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded World's Save Files diff --git a/CraftBukkit-Patches/0037-Optimized-version-of-LocaleLanguage.patch b/CraftBukkit-Patches/0036-Optimized-version-of-LocaleLanguage.patch similarity index 98% rename from CraftBukkit-Patches/0037-Optimized-version-of-LocaleLanguage.patch rename to CraftBukkit-Patches/0036-Optimized-version-of-LocaleLanguage.patch index 7a2ad8e311..aeb6d692d2 100644 --- a/CraftBukkit-Patches/0037-Optimized-version-of-LocaleLanguage.patch +++ b/CraftBukkit-Patches/0036-Optimized-version-of-LocaleLanguage.patch @@ -1,4 +1,4 @@ -From c23cc99833fb558581a2ca3be5c99c1f1bba72ac Mon Sep 17 00:00:00 2001 +From d7aef73a55fb697a5609c584f34f684085497fb9 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 8 May 2013 12:09:45 +1000 Subject: [PATCH] Optimized version of LocaleLanguage diff --git a/CraftBukkit-Patches/0038-Improve-next-tick-list-performance-on-chunk-unloads-.patch b/CraftBukkit-Patches/0037-Improve-next-tick-list-performance-on-chunk-unloads-.patch similarity index 99% rename from CraftBukkit-Patches/0038-Improve-next-tick-list-performance-on-chunk-unloads-.patch rename to CraftBukkit-Patches/0037-Improve-next-tick-list-performance-on-chunk-unloads-.patch index 8e8dd79425..6d90615359 100644 --- a/CraftBukkit-Patches/0038-Improve-next-tick-list-performance-on-chunk-unloads-.patch +++ b/CraftBukkit-Patches/0037-Improve-next-tick-list-performance-on-chunk-unloads-.patch @@ -1,4 +1,4 @@ -From 034219b07622cced54214debbd0fa0c8acea439f Mon Sep 17 00:00:00 2001 +From 9748c8731abbaeaeef82d6090504516a34b05d88 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 24 Apr 2013 01:43:33 -0500 Subject: [PATCH] Improve next-tick-list performance on chunk unloads, large diff --git a/CraftBukkit-Patches/0039-Remove-o-Option.patch b/CraftBukkit-Patches/0038-Remove-o-Option.patch similarity index 92% rename from CraftBukkit-Patches/0039-Remove-o-Option.patch rename to CraftBukkit-Patches/0038-Remove-o-Option.patch index 0d2748aa09..56e5749bc3 100644 --- a/CraftBukkit-Patches/0039-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0038-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From 89b2eed1417170cf2023553d4faa6046e19453a9 Mon Sep 17 00:00:00 2001 +From ae0e44f5154f07327ce85320d291f6d38d2b96b7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option diff --git a/CraftBukkit-Patches/0040-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0039-Recipe-Deconstruction.patch similarity index 97% rename from CraftBukkit-Patches/0040-Recipe-Deconstruction.patch rename to CraftBukkit-Patches/0039-Recipe-Deconstruction.patch index bc9d7d5b5d..043844204a 100644 --- a/CraftBukkit-Patches/0040-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0039-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From ec8e652e930e20d85863f583db5d82405d239885 Mon Sep 17 00:00:00 2001 +From 584fae45430e0fd52bcdb5742ca77f893a862264 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Jun 2013 16:34:38 +1000 Subject: [PATCH] Recipe Deconstruction diff --git a/CraftBukkit-Patches/0041-Fix-Health-Scaling.patch b/CraftBukkit-Patches/0040-Fix-Health-Scaling.patch similarity index 97% rename from CraftBukkit-Patches/0041-Fix-Health-Scaling.patch rename to CraftBukkit-Patches/0040-Fix-Health-Scaling.patch index e19104813c..a36c6b74a1 100644 --- a/CraftBukkit-Patches/0041-Fix-Health-Scaling.patch +++ b/CraftBukkit-Patches/0040-Fix-Health-Scaling.patch @@ -1,4 +1,4 @@ -From f2e9b44c737fee7f28844e142871a84e98767a3c Mon Sep 17 00:00:00 2001 +From 5537a2a1c5596e5df2f5f3d9c953f46ef7e3d372 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Sun, 2 Jun 2013 14:54:11 +1000 Subject: [PATCH] Fix Health Scaling diff --git a/CraftBukkit-Patches/0042-Fix-EntityShootBowEvent-with-Skeletons.patch b/CraftBukkit-Patches/0041-Fix-EntityShootBowEvent-with-Skeletons.patch similarity index 95% rename from CraftBukkit-Patches/0042-Fix-EntityShootBowEvent-with-Skeletons.patch rename to CraftBukkit-Patches/0041-Fix-EntityShootBowEvent-with-Skeletons.patch index a8429f487e..d0222641cb 100644 --- a/CraftBukkit-Patches/0042-Fix-EntityShootBowEvent-with-Skeletons.patch +++ b/CraftBukkit-Patches/0041-Fix-EntityShootBowEvent-with-Skeletons.patch @@ -1,4 +1,4 @@ -From 786be74a1dcb09d71c6992fa89699dfd084f3aaa Mon Sep 17 00:00:00 2001 +From 88def699bf4f7a11ff3764f0ecd9831c162ad0e2 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Sun, 2 Jun 2013 15:04:37 +1000 Subject: [PATCH] Fix EntityShootBowEvent with Skeletons diff --git a/CraftBukkit-Patches/0043-Implement-Arrow-API.patch b/CraftBukkit-Patches/0042-Implement-Arrow-API.patch similarity index 93% rename from CraftBukkit-Patches/0043-Implement-Arrow-API.patch rename to CraftBukkit-Patches/0042-Implement-Arrow-API.patch index 38ada62db9..bbd228457c 100644 --- a/CraftBukkit-Patches/0043-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0042-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From 486edfbe72d601217a4dd8a6695de10b5c333c0a Mon Sep 17 00:00:00 2001 +From 9bcb4c341ee6908fa4a141583283d21283f26a55 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:16:05 +1000 Subject: [PATCH] Implement Arrow API diff --git a/CraftBukkit-Patches/0044-Particle-API.patch b/CraftBukkit-Patches/0043-Particle-API.patch similarity index 99% rename from CraftBukkit-Patches/0044-Particle-API.patch rename to CraftBukkit-Patches/0043-Particle-API.patch index 1b93a289a4..3cb0082667 100644 --- a/CraftBukkit-Patches/0044-Particle-API.patch +++ b/CraftBukkit-Patches/0043-Particle-API.patch @@ -1,4 +1,4 @@ -From 21866de8328ae6f2caebf0112212db82d8271adb Mon Sep 17 00:00:00 2001 +From d1725f257553f7abf4fa2f13734713972b756b06 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API diff --git a/CraftBukkit-Patches/0045-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0044-Hopper-Cooldowns.patch similarity index 97% rename from CraftBukkit-Patches/0045-Hopper-Cooldowns.patch rename to CraftBukkit-Patches/0044-Hopper-Cooldowns.patch index ad423342eb..3681ae3bef 100644 --- a/CraftBukkit-Patches/0045-Hopper-Cooldowns.patch +++ b/CraftBukkit-Patches/0044-Hopper-Cooldowns.patch @@ -1,4 +1,4 @@ -From 82ed5616d56e9808448eddaff3c1704853e4d4d5 Mon Sep 17 00:00:00 2001 +From 4a2de4a9743e9e7b558366b8128dae5fd4cb3e0d Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sun, 2 Jun 2013 16:23:46 +1000 Subject: [PATCH] Hopper Cooldowns @@ -64,7 +64,7 @@ index f6d269d..1f69c7b 100644 iinventory.update(); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index de052ad..6d30a58 100644 +index 87d3b6e..0a30d4c 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -175,4 +175,13 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0046-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0045-Prevent-Shutdown-Hang.patch similarity index 87% rename from CraftBukkit-Patches/0046-Prevent-Shutdown-Hang.patch rename to CraftBukkit-Patches/0045-Prevent-Shutdown-Hang.patch index ab8013e33b..90ae321cda 100644 --- a/CraftBukkit-Patches/0046-Prevent-Shutdown-Hang.patch +++ b/CraftBukkit-Patches/0045-Prevent-Shutdown-Hang.patch @@ -1,4 +1,4 @@ -From 761f033bf12a80a479d7cac62eba1603773a97e7 Mon Sep 17 00:00:00 2001 +From c18ceeae093ea461e065fbea7051ab0917bf29dd Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 11:54:32 +1000 Subject: [PATCH] Prevent Shutdown Hang @@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang Prevents server hanging if players disconnect during the shutdown sequence. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a236c5f..6a58663 100644 +index 1891308..fe846af 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -1064,7 +1064,14 @@ public abstract class PlayerList { +@@ -1067,7 +1067,14 @@ public abstract class PlayerList { public void r() { while (!this.players.isEmpty()) { diff --git a/CraftBukkit-Patches/0047-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0046-Implement-SpawnerSpawnEvent.patch similarity index 98% rename from CraftBukkit-Patches/0047-Implement-SpawnerSpawnEvent.patch rename to CraftBukkit-Patches/0046-Implement-SpawnerSpawnEvent.patch index 7db6405c4a..8600f3ccaf 100644 --- a/CraftBukkit-Patches/0047-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0046-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From bb650303050f8dc42e5bdc7861e53cd609179bd3 Mon Sep 17 00:00:00 2001 +From 6257069117c3870c0b8640386252867a3f4f5c0a Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. diff --git a/CraftBukkit-Patches/0048-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0047-Firework-Meta-Crash-Fix.patch similarity index 94% rename from CraftBukkit-Patches/0048-Firework-Meta-Crash-Fix.patch rename to CraftBukkit-Patches/0047-Firework-Meta-Crash-Fix.patch index e76a417acf..5acb26bf08 100644 --- a/CraftBukkit-Patches/0048-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0047-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From 5045925cd02c861e4c6199c0d5eb9148c365daba Mon Sep 17 00:00:00 2001 +From 395165e77c0d165c30ffbba7eea45b98d81f4b93 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 15 Jun 2013 21:34:48 +1000 Subject: [PATCH] Firework Meta Crash Fix diff --git a/CraftBukkit-Patches/0049-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch similarity index 93% rename from CraftBukkit-Patches/0049-Do-Not-Search-for-Offline-Players.patch rename to CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch index 8c94849419..e41ab19a0d 100644 --- a/CraftBukkit-Patches/0049-Do-Not-Search-for-Offline-Players.patch +++ b/CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch @@ -1,4 +1,4 @@ -From 0ba4e79de49929e8f82c0f42539af7b7333a7e6f Mon Sep 17 00:00:00 2001 +From 86654f9d64ccc6fbefc3b5f7da9fa28b9d43563f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 16 Jun 2013 08:20:26 +1000 Subject: [PATCH] Do Not Search for Offline Players