diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 1d44ce59cf..c135171cbc 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 9d67cba92758aa8257d0d9dedfd2d98bb231ca8f Mon Sep 17 00:00:00 2001 +From ecf8a9f407c07efd658bfc06ca1c2628925c66f2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/Bukkit-Patches/0002-Measure-Timings-Duration.patch b/Bukkit-Patches/0002-Measure-Timings-Duration.patch index dfc3496c81..bfdc7ca4f1 100644 --- a/Bukkit-Patches/0002-Measure-Timings-Duration.patch +++ b/Bukkit-Patches/0002-Measure-Timings-Duration.patch @@ -1,4 +1,4 @@ -From 33cf8909fd2af5abf1f2a64b7bc3ff1ecdc9e9b8 Mon Sep 17 00:00:00 2001 +From 9e3fffd5a97e355ca42d86c9ef445efe2b58516f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 2 Jun 2013 10:42:57 +1000 Subject: [PATCH] Measure Timings Duration diff --git a/Bukkit-Patches/0003-Timings-Paste-Command.patch b/Bukkit-Patches/0003-Timings-Paste-Command.patch index 9da6ecc46c..8d986631d1 100644 --- a/Bukkit-Patches/0003-Timings-Paste-Command.patch +++ b/Bukkit-Patches/0003-Timings-Paste-Command.patch @@ -1,11 +1,11 @@ -From 51945be4f1d912c546ae3bbe12639de2784b5537 Mon Sep 17 00:00:00 2001 +From 72fa7c7524692663a48d20459360b4dd2d8f6127 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:55:20 +1000 Subject: [PATCH] Timings Paste Command diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index 3c4ef89..e3777ea 100644 +index c2874f1..7c28b75 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -19,6 +19,15 @@ import org.bukkit.util.StringUtil; @@ -136,5 +136,5 @@ index 3c4ef89..e3777ea 100644 + // Spigot end } -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0004-Enchanced-Timings.patch b/Bukkit-Patches/0004-Enchanced-Timings.patch index eeb35b732f..8febf4f6a5 100644 --- a/Bukkit-Patches/0004-Enchanced-Timings.patch +++ b/Bukkit-Patches/0004-Enchanced-Timings.patch @@ -1,4 +1,4 @@ -From d3a7f5809eceb7dbeda6ba6d77fd284b295b00c6 Mon Sep 17 00:00:00 2001 +From 91d36c0322fccafa061f0375eaed02cda0a19447 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 11:17:05 +1000 Subject: [PATCH] Enchanced Timings @@ -113,7 +113,7 @@ index 7c28b75..ec1320f 100644 } catch (IOException e) { } finally { diff --git a/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java b/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java -index d86805b..4b744ea 100644 +index e09234c..ab2c65e 100644 --- a/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java +++ b/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java @@ -11,6 +11,10 @@ import org.bukkit.event.Listener; @@ -372,5 +372,5 @@ index b206b1f..01b62fb 100644 Listener listener = new Listener() {}; EventExecutor executor = new EventExecutor() { -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch b/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch index 2a8ca68e4a..725b450c3e 100644 --- a/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 3203acca82b7ada939eb2c820ae112bec684d7d4 Mon Sep 17 00:00:00 2001 +From 22694aef996c25381c7c276d4d46885c82dc7447 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:31:20 +1100 Subject: [PATCH] Add PlayerItemDamageEvent @@ -65,5 +65,5 @@ index 0000000..38a72ab + } +} -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0006-BungeeCord-Support.patch b/Bukkit-Patches/0006-BungeeCord-Support.patch index d189e42c01..1c242a9a8d 100644 --- a/Bukkit-Patches/0006-BungeeCord-Support.patch +++ b/Bukkit-Patches/0006-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 912392969b3e727b360b37836a85b2456ad7c991 Mon Sep 17 00:00:00 2001 +From aed8c09032e9555f06ad01efe79a72e44c0bb3e6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support diff --git a/Bukkit-Patches/0007-Add-Arrow-API.patch b/Bukkit-Patches/0007-Add-Arrow-API.patch index 7012125433..e9c1a52168 100644 --- a/Bukkit-Patches/0007-Add-Arrow-API.patch +++ b/Bukkit-Patches/0007-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 3e5b2a2802c4739be6592fa013aa2ab5d0f91157 Mon Sep 17 00:00:00 2001 +From c076b0297466b1be8c4c9c6a622e7f0e30a4300f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:08:24 +1000 Subject: [PATCH] Add Arrow API @@ -33,5 +33,5 @@ index 26d3473..676fe2b 100644 + Spigot spigot(); +} -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0008-Add-Particle-API.patch b/Bukkit-Patches/0008-Add-Particle-API.patch index 54629a636d..823f0ff436 100644 --- a/Bukkit-Patches/0008-Add-Particle-API.patch +++ b/Bukkit-Patches/0008-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From bb9b6439fcc6c3657b5f778b681e39e0f1b9ee34 Mon Sep 17 00:00:00 2001 +From 05df017e79486dc7435a592d54014b8da3a906ed Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API diff --git a/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch index 65ad064389..e8c8e8dd5e 100644 --- a/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From e4aaa81f0b3679aecf548da2945c84bd4af3b53d Mon Sep 17 00:00:00 2001 +From 6380f957a4917616cfb36fcb299b8f8fe9a5ad7e Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:01 -0500 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent diff --git a/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch index f456c5c742..07b71485a2 100644 --- a/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch +++ b/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From c4a7b5cdf8ac2fa08df84014e94e53c80ed82a46 Mon Sep 17 00:00:00 2001 +From 8afee7fae3fb6e5906f7116c705a7b2933cc61cc Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:53 +1000 Subject: [PATCH] Entity Mount and Dismount Events @@ -108,5 +108,5 @@ index 0000000..16aa2a7 + } +} -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0011-Update-Depends.patch b/Bukkit-Patches/0011-Update-Depends.patch index 3f66a24271..a7478ee08c 100644 --- a/Bukkit-Patches/0011-Update-Depends.patch +++ b/Bukkit-Patches/0011-Update-Depends.patch @@ -1,4 +1,4 @@ -From 512a9d53929c21762f9a94683a8fb944288f6197 Mon Sep 17 00:00:00 2001 +From 18fe53680a58716ef7a2f0b8ef7da0d6a903e584 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 4 Jul 2013 20:05:19 +1000 Subject: [PATCH] Update Depends @@ -6,7 +6,7 @@ Subject: [PATCH] Update Depends - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries. diff --git a/pom.xml b/pom.xml -index 3dae8d4..a5b048e 100644 +index efb3262..f6ee82d 100644 --- a/pom.xml +++ b/pom.xml @@ -77,21 +77,21 @@ diff --git a/Bukkit-Patches/0012-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0012-InventoryClickEvent-getClickedInventory.patch index c037189d52..5fd3b37908 100644 --- a/Bukkit-Patches/0012-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0012-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From 17fc2456d07aaeff2099321de056e6a61e18462c Mon Sep 17 00:00:00 2001 +From 6175899bf3eb1db85f088bdd5765b39cafe7cfbe Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 7 Jul 2013 10:32:05 -0400 Subject: [PATCH] InventoryClickEvent getClickedInventory @@ -50,5 +50,5 @@ index 28198b8..3313d91 100644 * * @return the slot type -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch b/Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch index 2e9dc0b73b..0fc796aa56 100644 --- a/Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch +++ b/Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch @@ -1,4 +1,4 @@ -From 061b904c4d4c86c60283080b60e44d0a7ca68abe Mon Sep 17 00:00:00 2001 +From f555fa83917fc1b8b3f04d17474e9f3dd77e83aa Mon Sep 17 00:00:00 2001 From: Alex Bennett Date: Thu, 11 Jul 2013 15:31:32 -0500 Subject: [PATCH] Added getAllSessionData() to the Conversation API. diff --git a/Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch index 2f3b1bd028..0f73b0057c 100644 --- a/Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch @@ -1,4 +1,4 @@ -From 8c588a47e59db68d802c08d47f9be97bc4c5e09a Mon Sep 17 00:00:00 2001 +From d802b950620698530d09f1bbf4cead0875514acc Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 22 Jul 2013 19:09:43 +1000 Subject: [PATCH] Catch Conversation API Errors diff --git a/Bukkit-Patches/0015-Player-Collision-API.patch b/Bukkit-Patches/0015-Player-Collision-API.patch index 71aebeed2c..5f0d1c28bb 100644 --- a/Bukkit-Patches/0015-Player-Collision-API.patch +++ b/Bukkit-Patches/0015-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 25627541c2c5d7e0ead8ddeb5ceb54f7fc2f9fd5 Mon Sep 17 00:00:00 2001 +From ea4086f1dab600580f00989f73df0d5ce7926513 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API diff --git a/Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch b/Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch index eb57aadfa6..2319494fd8 100644 --- a/Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From 09ffec47d3a03dc0b86bcd303bebe6bb837ddd39 Mon Sep 17 00:00:00 2001 +From f0bae7b84e09f60501778e6c42ebaa948c384619 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:42:16 +1000 Subject: [PATCH] Expand Boolean Prompt Values diff --git a/Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch index b83493665c..bd835bb2ec 100644 --- a/Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From a8a099f5f2035ace89be9d9b7dfe4cc7c470a629 Mon Sep 17 00:00:00 2001 +From 237b0b740120484e05de4a45066e83235f158db7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:49:36 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/Bukkit-Patches/0018-Add-respawn-API.patch b/Bukkit-Patches/0018-Add-respawn-API.patch index 70bafd1bc0..fb8449008d 100644 --- a/Bukkit-Patches/0018-Add-respawn-API.patch +++ b/Bukkit-Patches/0018-Add-respawn-API.patch @@ -1,4 +1,4 @@ -From a693df4f53bb8e5c86a9dc5e67f4387838d266b3 Mon Sep 17 00:00:00 2001 +From 926cebe2d1f455c7f309ae70e4879c29acbf0e7c Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. diff --git a/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch b/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch index f83631af6b..5362dd3f1b 100644 --- a/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch +++ b/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch @@ -1,11 +1,11 @@ -From 755f74b7b1c634e6f3282b6d8ff41021ccb36d09 Mon Sep 17 00:00:00 2001 +From 8e6a3caa62c4b17bdc9d2994201a51af8f3b7026 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 19 Oct 2013 12:59:42 +1100 Subject: [PATCH] Fix Plugin Message API Disconnects diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java -index e90f2e1..e6f008c 100644 +index a906f8d..4c171e8 100644 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java @@ -421,7 +421,15 @@ public class StandardMessenger implements Messenger { diff --git a/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch b/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch index 67a536127b..7d91fd238c 100644 --- a/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch +++ b/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch @@ -1,4 +1,4 @@ -From b3235471bc185d87ea76910a169501977ec9c578 Mon Sep 17 00:00:00 2001 +From 9f356ddcc7487abf849f336e32efe87d3505f4c7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 18 Dec 2013 10:19:50 +1100 Subject: [PATCH] Allow for fallback commands to be removed. diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 119e9f5836..3e6ec271fd 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From da0ad65b3037c143034e4f7786e011564e79ccd5 Mon Sep 17 00:00:00 2001 +From 9d40d84ac4866fa3ee8c9d2549adb1a1f2bd6419 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index 0beceda267..1cf54b63eb 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From 39c78878f6e330ac4bd59e73fb728fb95c55ee6b Mon Sep 17 00:00:00 2001 +From 40f35de3f974c832544ea0f1dfa24c8281688606 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index befa094f33..70eb9d540f 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From cbba21527d0a1db4429922e98e09d0d1a82689ae Mon Sep 17 00:00:00 2001 +From 40711385ca8b77d9ab8417823549dfd7eb8d66ee Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index eefb9ae054..a50b194ec9 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 64d8f6301c45ffcaa96adc2efaa76226dc944bea Mon Sep 17 00:00:00 2001 +From ebc53eba3d6c1be63644e431ca2c7f61c213cb8a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -54,7 +54,7 @@ index f850a0f..cd529ec 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 15a5a5d..93e1782 100644 +index 61455c8..244c727 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -230,8 +230,10 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch index 96b462ca28..bdf5135a3f 100644 --- a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch @@ -1,4 +1,4 @@ -From 2f1db462086493e906e383db29bcf5e3435378ba Mon Sep 17 00:00:00 2001 +From 339e436f6fbc5278904715ac9cc65b0273e6d417 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:56:02 +1000 Subject: [PATCH] Better Chunk Tick Selection diff --git a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch index 93841152e9..3628c2c96c 100644 --- a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From bc5162273e8368ab4ee696dff9624f2bc9363520 Mon Sep 17 00:00:00 2001 +From 52b47191f7175fd941117308964a2d01f09f5efe Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates diff --git a/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch index 1c9dbe64fa..d045786b97 100644 --- a/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch +++ b/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch @@ -1,4 +1,4 @@ -From ff637c04c532b97e577121ac1790ff689ad7bf31 Mon Sep 17 00:00:00 2001 +From 3b7ea48f1ad5cdd184fd718356141793eb7409f4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:09:45 +1000 Subject: [PATCH] More Efficient Chunk Save Queue