From 0730a13e5c1f1366bc108f82e159be21b099f213 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 1 Jun 2015 19:22:52 +1000 Subject: [PATCH] Remove custom links patch. --- .../0005-Spigot-Configuration.patch | 4 +- ...low-Disabling-of-Command-TabComplete.patch | 4 +- .../0029-Configurable-Messages.patch | 4 +- .../0055-BungeeCord-Support.patch | 4 +- .../0074-Add-Spigot-Links.patch | 77 ------------------- ... 0074-Configurable-Ping-Sample-Size.patch} | 4 +- ...=> 0075-Add-Optional-Tick-Shuffling.patch} | 4 +- ...Allow-Configuring-Chunks-per-Packet.patch} | 0 ...Implement-Locale-Getter-for-Players.patch} | 0 ...patch => 0078-Cap-Entity-Collisions.patch} | 0 ...ne-meal-not-having-the-correct-data.patch} | 0 ...atch => 0080-Spam-Filter-Exclusions.patch} | 4 +- ...ion-to-Silence-CommandBlock-Console.patch} | 4 +- ...support-for-fetching-hidden-players.patch} | 0 ...llow-Disabling-Creative-Item-Filter.patch} | 4 +- ...h => 0084-Cap-Channel-Registrations.patch} | 0 ...mands-to-be-the-main-version-of-a-c.patch} | 4 +- ...the-isDisconnected-method-by-bukkit.patch} | 0 ...Implement-Silenceable-Lightning-API.patch} | 0 ...missibleBase-for-all-Command-Blocks.patch} | 0 ...Prevent-hoppers-from-loading-chunks.patch} | 0 ...ist.patch => 0090-Guard-Entity-List.patch} | 0 ...ificationException-while-being-idle.patch} | 0 ...ncellable-WitherSkull-potion-effect.patch} | 0 ...iptive-kick-reasons-instead-of-Nope.patch} | 0 ...ragon-death-and-wither-spawn-sounds.patch} | 0 ...-client-crashes-server-lists-and-Mo.patch} | 0 ...=> 0096-Treat-Bungee-as-Online-Mode.patch} | 0 ...atch => 0097-Add-Conversion-Message.patch} | 0 ...el-fishing-event.-Fixes-BUKKIT-5396.patch} | 0 ...99-Print-Stack-on-InternalException.patch} | 0 ...ffline-Player-Data-Once-if-Required.patch} | 0 ...se-for-Non-Existent-Offline-Players.patch} | 0 ...Check-for-blank-OfflinePlayer-Names.patch} | 0 ...ng.patch => 0103-Fix-Player-Banning.patch} | 0 ....patch => 0104-Fix-ban-expire-dates.patch} | 0 ...atch => 0105-Correct-Ban-Expiration.patch} | 0 ...> 0106-Convert-Horses-owner-to-UUID.patch} | 0 ... => 0107-Add-Score.isScoreSet-Z-API.patch} | 0 ...h => 0108-Log-null-TileEntity-Owner.patch} | 0 ...al-case-invalid-usernames-for-UUIDs.patch} | 0 ...=> 0110-Convert-player-skulls-async.patch} | 0 ...sDefError-crash-and-notify-on-crash.patch} | 0 ....patch => 0112-Check-Skull-canPlace.patch} | 0 ...n-that-could-kill-connections-befor.patch} | 0 ... => 0114-Configurable-UserCache-cap.patch} | 0 ...-Implement-PlayerSpawnLocationEvent.patch} | 0 ... => 0116-Cap-Objective-Score-Length.patch} | 0 ...ion-input-on-the-main-thread.-Fixes.patch} | 0 ...ble-save-on-stop-only-for-UserCache.patch} | 0 ...9-Prevent-Unbounded-IntCache-Growth.patch} | 0 ...-Add-damager-to-the-unhandled-error.patch} | 0 ...21-Cross-World-Entity-Teleportation.patch} | 0 ...block-placement-interaction-packets.patch} | 0 ...atch => 0123-Better-item-validation.patch} | 0 ... => 0124-Further-Seed-Customisation.patch} | 0 ...> 0125-Disable-ResourceLeakDetector.patch} | 0 ...-Information-to-session.lock-Errors.patch} | 0 ...ng.patch => 0127-Safer-JSON-Loading.patch} | 0 ... => 0128-Fix-Slow-Loading-Libraries.patch} | 0 ...h => 0129-Add-CommandLine-EULA-Flag.patch} | 0 ...g-table-wiping-meta-when-placing-st.patch} | 0 ...-ocelots-when-plugins-spawn-ocelots.patch} | 0 ...revent-a-crash-involving-attributes.patch} | 0 ...ke-moved-wrongly-limit-configurable.patch} | 0 ...=> 0134-Fix-Null-Tile-Entity-Worlds.patch} | 0 ...oved-too-quickly-limit-configurable.patch} | 0 ...Apply-NBTReadLimiter-to-more-things.patch} | 0 ...tch => 0137-Allow-Attribute-Capping.patch} | 0 ...fetch-an-online-UUID-in-online-mode.patch} | 0 ...modifiers-which-cause-the-attribute.patch} | 0 ...h => 0140-Plug-WorldMap-Memory-Leak.patch} | 0 ...=> 0141-Fix-Corrupted-Trapped-Chest.patch} | 0 ...h => 0142-Remove-uneeded-validation.patch} | 0 ...ch => 0143-Add-Hunger-Config-Values.patch} | 0 ...> 0144-Make-debug-logging-togglable.patch} | 0 ...p-invalid-enchants-in-CraftMetaItem.patch} | 0 ...0146-Limit-TNT-Detonations-per-tick.patch} | 0 ...able-and-setUnbreakable-to-ItemMeta.patch} | 0 ...h => 0148-Configurable-Hanging-Tick.patch} | 0 ...tch => 0149-Refactor-ItemDoor-Place.patch} | 0 ...I.patch => 0150-BungeeCord-Chat-API.patch} | 0 ...-Use-Standard-List-for-EntitySlices.patch} | 0 ...Allow-Capping-Tile-Entity-Tick-Time.patch} | 0 ...stMatches-for-ItemStack-Dirty-Check.patch} | 0 ... 0154-Use-CLQ-for-main-thread-tasks.patch} | 0 86 files changed, 10 insertions(+), 107 deletions(-) delete mode 100644 CraftBukkit-Patches/0074-Add-Spigot-Links.patch rename CraftBukkit-Patches/{0075-Configurable-Ping-Sample-Size.patch => 0074-Configurable-Ping-Sample-Size.patch} (98%) rename CraftBukkit-Patches/{0076-Add-Optional-Tick-Shuffling.patch => 0075-Add-Optional-Tick-Shuffling.patch} (98%) rename CraftBukkit-Patches/{0077-Allow-Configuring-Chunks-per-Packet.patch => 0076-Allow-Configuring-Chunks-per-Packet.patch} (100%) rename CraftBukkit-Patches/{0078-Implement-Locale-Getter-for-Players.patch => 0077-Implement-Locale-Getter-for-Players.patch} (100%) rename CraftBukkit-Patches/{0079-Cap-Entity-Collisions.patch => 0078-Cap-Entity-Collisions.patch} (100%) rename CraftBukkit-Patches/{0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (100%) rename CraftBukkit-Patches/{0081-Spam-Filter-Exclusions.patch => 0080-Spam-Filter-Exclusions.patch} (99%) rename CraftBukkit-Patches/{0082-Add-Option-to-Silence-CommandBlock-Console.patch => 0081-Add-Option-to-Silence-CommandBlock-Console.patch} (98%) rename CraftBukkit-Patches/{0083-Add-support-for-fetching-hidden-players.patch => 0082-Add-support-for-fetching-hidden-players.patch} (100%) rename CraftBukkit-Patches/{0084-Allow-Disabling-Creative-Item-Filter.patch => 0083-Allow-Disabling-Creative-Item-Filter.patch} (99%) rename CraftBukkit-Patches/{0085-Cap-Channel-Registrations.patch => 0084-Cap-Channel-Registrations.patch} (100%) rename CraftBukkit-Patches/{0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (99%) rename CraftBukkit-Patches/{0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (100%) rename CraftBukkit-Patches/{0088-Implement-Silenceable-Lightning-API.patch => 0087-Implement-Silenceable-Lightning-API.patch} (100%) rename CraftBukkit-Patches/{0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (100%) rename CraftBukkit-Patches/{0090-Prevent-hoppers-from-loading-chunks.patch => 0089-Prevent-hoppers-from-loading-chunks.patch} (100%) rename CraftBukkit-Patches/{0091-Guard-Entity-List.patch => 0090-Guard-Entity-List.patch} (100%) rename CraftBukkit-Patches/{0092-Fix-ConcurrentModificationException-while-being-idle.patch => 0091-Fix-ConcurrentModificationException-while-being-idle.patch} (100%) rename CraftBukkit-Patches/{0093-Cancellable-WitherSkull-potion-effect.patch => 0092-Cancellable-WitherSkull-potion-effect.patch} (100%) rename CraftBukkit-Patches/{0094-Descriptive-kick-reasons-instead-of-Nope.patch => 0093-Descriptive-kick-reasons-instead-of-Nope.patch} (100%) rename CraftBukkit-Patches/{0095-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0094-Configurable-dragon-death-and-wither-spawn-sounds.patch} (100%) rename CraftBukkit-Patches/{0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (100%) rename CraftBukkit-Patches/{0097-Treat-Bungee-as-Online-Mode.patch => 0096-Treat-Bungee-as-Online-Mode.patch} (100%) rename CraftBukkit-Patches/{0098-Add-Conversion-Message.patch => 0097-Add-Conversion-Message.patch} (100%) rename CraftBukkit-Patches/{0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch => 0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch} (100%) rename CraftBukkit-Patches/{0100-Print-Stack-on-InternalException.patch => 0099-Print-Stack-on-InternalException.patch} (100%) rename CraftBukkit-Patches/{0101-Use-Offline-Player-Data-Once-if-Required.patch => 0100-Use-Offline-Player-Data-Once-if-Required.patch} (100%) rename CraftBukkit-Patches/{0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch => 0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch} (100%) rename CraftBukkit-Patches/{0103-Check-for-blank-OfflinePlayer-Names.patch => 0102-Check-for-blank-OfflinePlayer-Names.patch} (100%) rename CraftBukkit-Patches/{0104-Fix-Player-Banning.patch => 0103-Fix-Player-Banning.patch} (100%) rename CraftBukkit-Patches/{0105-Fix-ban-expire-dates.patch => 0104-Fix-ban-expire-dates.patch} (100%) rename CraftBukkit-Patches/{0106-Correct-Ban-Expiration.patch => 0105-Correct-Ban-Expiration.patch} (100%) rename CraftBukkit-Patches/{0107-Convert-Horses-owner-to-UUID.patch => 0106-Convert-Horses-owner-to-UUID.patch} (100%) rename CraftBukkit-Patches/{0108-Add-Score.isScoreSet-Z-API.patch => 0107-Add-Score.isScoreSet-Z-API.patch} (100%) rename CraftBukkit-Patches/{0109-Log-null-TileEntity-Owner.patch => 0108-Log-null-TileEntity-Owner.patch} (100%) rename CraftBukkit-Patches/{0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch => 0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch} (100%) rename CraftBukkit-Patches/{0111-Convert-player-skulls-async.patch => 0110-Convert-player-skulls-async.patch} (100%) rename CraftBukkit-Patches/{0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch => 0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch} (100%) rename CraftBukkit-Patches/{0113-Check-Skull-canPlace.patch => 0112-Check-Skull-canPlace.patch} (100%) rename CraftBukkit-Patches/{0114-Fix-race-condition-that-could-kill-connections-befor.patch => 0113-Fix-race-condition-that-could-kill-connections-befor.patch} (100%) rename CraftBukkit-Patches/{0115-Configurable-UserCache-cap.patch => 0114-Configurable-UserCache-cap.patch} (100%) rename CraftBukkit-Patches/{0116-Implement-PlayerSpawnLocationEvent.patch => 0115-Implement-PlayerSpawnLocationEvent.patch} (100%) rename CraftBukkit-Patches/{0117-Cap-Objective-Score-Length.patch => 0116-Cap-Objective-Score-Length.patch} (100%) rename CraftBukkit-Patches/{0118-Process-conversation-input-on-the-main-thread.-Fixes.patch => 0117-Process-conversation-input-on-the-main-thread.-Fixes.patch} (100%) rename CraftBukkit-Patches/{0119-Configurable-save-on-stop-only-for-UserCache.patch => 0118-Configurable-save-on-stop-only-for-UserCache.patch} (100%) rename CraftBukkit-Patches/{0120-Prevent-Unbounded-IntCache-Growth.patch => 0119-Prevent-Unbounded-IntCache-Growth.patch} (100%) rename CraftBukkit-Patches/{0121-Add-damager-to-the-unhandled-error.patch => 0120-Add-damager-to-the-unhandled-error.patch} (100%) rename CraftBukkit-Patches/{0122-Cross-World-Entity-Teleportation.patch => 0121-Cross-World-Entity-Teleportation.patch} (100%) rename CraftBukkit-Patches/{0123-Limit-block-placement-interaction-packets.patch => 0122-Limit-block-placement-interaction-packets.patch} (100%) rename CraftBukkit-Patches/{0124-Better-item-validation.patch => 0123-Better-item-validation.patch} (100%) rename CraftBukkit-Patches/{0125-Further-Seed-Customisation.patch => 0124-Further-Seed-Customisation.patch} (100%) rename CraftBukkit-Patches/{0126-Disable-ResourceLeakDetector.patch => 0125-Disable-ResourceLeakDetector.patch} (100%) rename CraftBukkit-Patches/{0127-Add-More-Information-to-session.lock-Errors.patch => 0126-Add-More-Information-to-session.lock-Errors.patch} (100%) rename CraftBukkit-Patches/{0128-Safer-JSON-Loading.patch => 0127-Safer-JSON-Loading.patch} (100%) rename CraftBukkit-Patches/{0129-Fix-Slow-Loading-Libraries.patch => 0128-Fix-Slow-Loading-Libraries.patch} (100%) rename CraftBukkit-Patches/{0130-Add-CommandLine-EULA-Flag.patch => 0129-Add-CommandLine-EULA-Flag.patch} (100%) rename CraftBukkit-Patches/{0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch => 0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch} (100%) rename CraftBukkit-Patches/{0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch => 0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch} (100%) rename CraftBukkit-Patches/{0133-Prevent-a-crash-involving-attributes.patch => 0132-Prevent-a-crash-involving-attributes.patch} (100%) rename CraftBukkit-Patches/{0134-Make-moved-wrongly-limit-configurable.patch => 0133-Make-moved-wrongly-limit-configurable.patch} (100%) rename CraftBukkit-Patches/{0135-Fix-Null-Tile-Entity-Worlds.patch => 0134-Fix-Null-Tile-Entity-Worlds.patch} (100%) rename CraftBukkit-Patches/{0136-Make-moved-too-quickly-limit-configurable.patch => 0135-Make-moved-too-quickly-limit-configurable.patch} (100%) rename CraftBukkit-Patches/{0137-Apply-NBTReadLimiter-to-more-things.patch => 0136-Apply-NBTReadLimiter-to-more-things.patch} (100%) rename CraftBukkit-Patches/{0138-Allow-Attribute-Capping.patch => 0137-Allow-Attribute-Capping.patch} (100%) rename CraftBukkit-Patches/{0139-Only-fetch-an-online-UUID-in-online-mode.patch => 0138-Only-fetch-an-online-UUID-in-online-mode.patch} (100%) rename CraftBukkit-Patches/{0140-Filter-attribute-modifiers-which-cause-the-attribute.patch => 0139-Filter-attribute-modifiers-which-cause-the-attribute.patch} (100%) rename CraftBukkit-Patches/{0141-Plug-WorldMap-Memory-Leak.patch => 0140-Plug-WorldMap-Memory-Leak.patch} (100%) rename CraftBukkit-Patches/{0142-Fix-Corrupted-Trapped-Chest.patch => 0141-Fix-Corrupted-Trapped-Chest.patch} (100%) rename CraftBukkit-Patches/{0143-Remove-uneeded-validation.patch => 0142-Remove-uneeded-validation.patch} (100%) rename CraftBukkit-Patches/{0144-Add-Hunger-Config-Values.patch => 0143-Add-Hunger-Config-Values.patch} (100%) rename CraftBukkit-Patches/{0145-Make-debug-logging-togglable.patch => 0144-Make-debug-logging-togglable.patch} (100%) rename CraftBukkit-Patches/{0146-Skip-invalid-enchants-in-CraftMetaItem.patch => 0145-Skip-invalid-enchants-in-CraftMetaItem.patch} (100%) rename CraftBukkit-Patches/{0147-Limit-TNT-Detonations-per-tick.patch => 0146-Limit-TNT-Detonations-per-tick.patch} (100%) rename CraftBukkit-Patches/{0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch => 0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch} (100%) rename CraftBukkit-Patches/{0149-Configurable-Hanging-Tick.patch => 0148-Configurable-Hanging-Tick.patch} (100%) rename CraftBukkit-Patches/{0150-Refactor-ItemDoor-Place.patch => 0149-Refactor-ItemDoor-Place.patch} (100%) rename CraftBukkit-Patches/{0151-BungeeCord-Chat-API.patch => 0150-BungeeCord-Chat-API.patch} (100%) rename CraftBukkit-Patches/{0152-Use-Standard-List-for-EntitySlices.patch => 0151-Use-Standard-List-for-EntitySlices.patch} (100%) rename CraftBukkit-Patches/{0153-Allow-Capping-Tile-Entity-Tick-Time.patch => 0152-Allow-Capping-Tile-Entity-Tick-Time.patch} (100%) rename CraftBukkit-Patches/{0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch => 0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch} (100%) rename CraftBukkit-Patches/{0155-Use-CLQ-for-main-thread-tasks.patch => 0154-Use-CLQ-for-main-thread-tasks.patch} (100%) diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index 17f19fab35..e974fc02a4 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -335,6 +335,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); + } +} --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch index 04a511adaa..ab9879cdea 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch @@ -48,6 +48,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + tabComplete = getInt( "commands.tab-complete", 0 ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index 1cf510fce2..85632c7814 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -102,6 +102,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch index 40dd7f8057..c82519ce9d 100644 --- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch @@ -211,6 +211,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + bungee = getBoolean( "settings.bungeecord", false ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0074-Add-Spigot-Links.patch b/CraftBukkit-Patches/0074-Add-Spigot-Links.patch deleted file mode 100644 index c591e99b20..0000000000 --- a/CraftBukkit-Patches/0074-Add-Spigot-Links.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Thu, 23 Jan 2014 13:17:35 +1100 -Subject: [PATCH] Add Spigot Links - - -diff --git a/README.md b/README.md -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/README.md -+++ b/README.md -@@ -0,0 +0,0 @@ --CraftBukkit -+Spigot - =========== - --A Bukkit (Minecraft Server API) implementation -+A Spigot-API and Bukkit implementation - --Website: [http://bukkit.org](http://bukkit.org) --Bugs/Suggestions: [http://leaky.bukkit.org](http://leaky.bukkit.org) --Contributing Guidelines: [CONTRIBUTING.md](https://github.com/Bukkit/CraftBukkit/blob/master/CONTRIBUTING.md) -+Website: [http://spigotmc.org](http://spigotmc.org) -+Bugs/Suggestions: [http://www.spigotmc.org/forums/bugs-feature-requests.8/](http://www.spigotmc.org/forums/bugs-feature-requests.8/) -+Contributing Guidelines: [CONTRIBUTING.md](https://github.com/SpigotMC/Spigot-API/blob/master/CONTRIBUTING.md) - - Compilation - ----------- -@@ -0,0 +0,0 @@ Compilation - We use maven to handle our dependencies. - - * Install [Maven 3](http://maven.apache.org/download.html) --* Check out and install [Bukkit](http://github.com/Bukkit/Bukkit) -- * *Note*: this is not needed as the repository we use has Bukkit too, but you might have a newer one (with your own changes :D) -+* Check out and install [Spigot-API](http://github.com/SpigotMC/Spigot) -+ * *Note*: this is not needed as the repository we use has Spigot-API too, but you might have a newer one (with your own changes :D) - * Check out this repo and: `mvn clean package` -diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/resources/configurations/bukkit.yml -+++ b/src/main/resources/configurations/bukkit.yml -@@ -0,0 +0,0 @@ - # If you need help on this file, feel free to join us on irc or leave a message - # on the forums asking for advice. - # --# IRC: #bukkit @ esper.net --# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit ) --# Forums: http://forums.bukkit.org/forums/bukkit-help.6/ --# Twitter: http://twitter.com/CraftBukkit --# Bug tracker: http://leaky.bukkit.org/ -+# IRC: #spigot @ irc.spi.gt -+# (If this means nothing to you, just go to http://irc.spi.gt/iris/?nick=&channels=spigot ) -+# Forums: http://www.spigotmc.org/forums/help.40/ -+# Bug tracker: http://www.spigotmc.org/forums/bugs-feature-requests.8/ - - - settings: -diff --git a/src/main/resources/configurations/commands.yml b/src/main/resources/configurations/commands.yml -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/resources/configurations/commands.yml -+++ b/src/main/resources/configurations/commands.yml -@@ -0,0 +0,0 @@ - # If you need help on this file, feel free to join us on irc or leave a message - # on the forums asking for advice. - # --# IRC: #bukkit @ esper.net --# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit ) --# Forums: http://forums.bukkit.org/forums/bukkit-help.6/ --# Twitter: http://twitter.com/CraftBukkit --# Bug tracker: http://leaky.bukkit.org/ -+# IRC: #spigot @ irc.spi.gt -+# (If this means nothing to you, just go to http://irc.spi.gt/iris/?nick=&channels=spigot ) -+# Forums: http://www.spigotmc.org/forums/help.40/ -+# Bug tracker: http://www.spigotmc.org/forums/bugs-feature-requests.8/ - - command-block-overrides: [] - aliases: --- \ No newline at end of file diff --git a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch similarity index 98% rename from CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch index d0dda068b6..be99278f00 100644 --- a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch @@ -38,6 +38,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + System.out.println( "Server Ping Player Sample Count: " + playerSample ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch similarity index 98% rename from CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch index 59ca7141b7..96ad363d0b 100644 --- a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch @@ -38,6 +38,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + playerShuffle = getInt( "settings.player-shuffle", 0 ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch similarity index 100% rename from CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch diff --git a/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch similarity index 100% rename from CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch diff --git a/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch similarity index 100% rename from CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch diff --git a/CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 100% rename from CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch diff --git a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch similarity index 99% rename from CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch index 0840a9e2db..58ec815e8d 100644 --- a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch @@ -56,6 +56,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } ) ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 98% rename from CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch index d806d997a1..604ae1e8a9 100644 --- a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch @@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + silentCommandBlocks = getBoolean( "commands.silent-commandblock-console", false ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch similarity index 100% rename from CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch diff --git a/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch similarity index 99% rename from CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch index 73aaf92faf..dcdbd5827a 100644 --- a/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch @@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + filterCreativeItems = getBoolean( "settings.filter-creative-items", true ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch similarity index 100% rename from CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch diff --git a/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 99% rename from CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 6f4c61421c..b97a831736 100644 --- a/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -75,6 +75,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 100% rename from CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch diff --git a/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch similarity index 100% rename from CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch diff --git a/CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 100% rename from CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch diff --git a/CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch similarity index 100% rename from CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch diff --git a/CraftBukkit-Patches/0091-Guard-Entity-List.patch b/CraftBukkit-Patches/0090-Guard-Entity-List.patch similarity index 100% rename from CraftBukkit-Patches/0091-Guard-Entity-List.patch rename to CraftBukkit-Patches/0090-Guard-Entity-List.patch diff --git a/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 100% rename from CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch diff --git a/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch similarity index 100% rename from CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch diff --git a/CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 100% rename from CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch diff --git a/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 100% rename from CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch diff --git a/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 100% rename from CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch diff --git a/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch similarity index 100% rename from CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch diff --git a/CraftBukkit-Patches/0098-Add-Conversion-Message.patch b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch similarity index 100% rename from CraftBukkit-Patches/0098-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0097-Add-Conversion-Message.patch diff --git a/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch similarity index 100% rename from CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch rename to CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch diff --git a/CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch similarity index 100% rename from CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch diff --git a/CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch similarity index 100% rename from CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch rename to CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch diff --git a/CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch similarity index 100% rename from CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch rename to CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch diff --git a/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch similarity index 100% rename from CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch diff --git a/CraftBukkit-Patches/0104-Fix-Player-Banning.patch b/CraftBukkit-Patches/0103-Fix-Player-Banning.patch similarity index 100% rename from CraftBukkit-Patches/0104-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0103-Fix-Player-Banning.patch diff --git a/CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch similarity index 100% rename from CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch diff --git a/CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch similarity index 100% rename from CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch diff --git a/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch similarity index 100% rename from CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch diff --git a/CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch similarity index 100% rename from CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch diff --git a/CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch similarity index 100% rename from CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch diff --git a/CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch similarity index 100% rename from CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch rename to CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch diff --git a/CraftBukkit-Patches/0111-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch similarity index 100% rename from CraftBukkit-Patches/0111-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0110-Convert-player-skulls-async.patch diff --git a/CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch similarity index 100% rename from CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch rename to CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch diff --git a/CraftBukkit-Patches/0113-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch similarity index 100% rename from CraftBukkit-Patches/0113-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0112-Check-Skull-canPlace.patch diff --git a/CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch similarity index 100% rename from CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch rename to CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch diff --git a/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch similarity index 100% rename from CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch rename to CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch diff --git a/CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch similarity index 100% rename from CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch rename to CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch diff --git a/CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch similarity index 100% rename from CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch rename to CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch diff --git a/CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch similarity index 100% rename from CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch rename to CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch diff --git a/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch similarity index 100% rename from CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch rename to CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch diff --git a/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch similarity index 100% rename from CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch rename to CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch diff --git a/CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch similarity index 100% rename from CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch rename to CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch diff --git a/CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch similarity index 100% rename from CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch rename to CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch diff --git a/CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch similarity index 100% rename from CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch rename to CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch diff --git a/CraftBukkit-Patches/0124-Better-item-validation.patch b/CraftBukkit-Patches/0123-Better-item-validation.patch similarity index 100% rename from CraftBukkit-Patches/0124-Better-item-validation.patch rename to CraftBukkit-Patches/0123-Better-item-validation.patch diff --git a/CraftBukkit-Patches/0125-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch similarity index 100% rename from CraftBukkit-Patches/0125-Further-Seed-Customisation.patch rename to CraftBukkit-Patches/0124-Further-Seed-Customisation.patch diff --git a/CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch similarity index 100% rename from CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch rename to CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch diff --git a/CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch similarity index 100% rename from CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch rename to CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch diff --git a/CraftBukkit-Patches/0128-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch similarity index 100% rename from CraftBukkit-Patches/0128-Safer-JSON-Loading.patch rename to CraftBukkit-Patches/0127-Safer-JSON-Loading.patch diff --git a/CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch similarity index 100% rename from CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch rename to CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch diff --git a/CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch similarity index 100% rename from CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch rename to CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch diff --git a/CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch similarity index 100% rename from CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch rename to CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch diff --git a/CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch similarity index 100% rename from CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch rename to CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch diff --git a/CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch similarity index 100% rename from CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch rename to CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch diff --git a/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch similarity index 100% rename from CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch rename to CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch diff --git a/CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch similarity index 100% rename from CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch diff --git a/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch similarity index 100% rename from CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch rename to CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch diff --git a/CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch similarity index 100% rename from CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch diff --git a/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch similarity index 100% rename from CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch diff --git a/CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch similarity index 100% rename from CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch rename to CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch diff --git a/CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch similarity index 100% rename from CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch rename to CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch diff --git a/CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch similarity index 100% rename from CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch rename to CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch diff --git a/CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch similarity index 100% rename from CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch rename to CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch diff --git a/CraftBukkit-Patches/0143-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch similarity index 100% rename from CraftBukkit-Patches/0143-Remove-uneeded-validation.patch rename to CraftBukkit-Patches/0142-Remove-uneeded-validation.patch diff --git a/CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch similarity index 100% rename from CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch rename to CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch diff --git a/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch similarity index 100% rename from CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch rename to CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch diff --git a/CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch similarity index 100% rename from CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch rename to CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch diff --git a/CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch similarity index 100% rename from CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch rename to CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch diff --git a/CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch similarity index 100% rename from CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch rename to CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch diff --git a/CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch similarity index 100% rename from CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch rename to CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch diff --git a/CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch similarity index 100% rename from CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch rename to CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch diff --git a/CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch similarity index 100% rename from CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch rename to CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch diff --git a/CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch similarity index 100% rename from CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch rename to CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch diff --git a/CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch similarity index 100% rename from CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch rename to CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch diff --git a/CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch similarity index 100% rename from CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch rename to CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch diff --git a/CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch similarity index 100% rename from CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch rename to CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch