diff --git a/CraftBukkit-Patches/0105-Normalize-spaces-on-when-reading-a-chat-packet.patch b/CraftBukkit-Patches/0105-Normalize-spaces-on-when-reading-a-chat-packet.patch deleted file mode 100644 index 52bfc135bd..0000000000 --- a/CraftBukkit-Patches/0105-Normalize-spaces-on-when-reading-a-chat-packet.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2aaa2a94260bdbe00371e1e246800cf7b7c91a4a Mon Sep 17 00:00:00 2001 -From: Thinkofdeath -Date: Wed, 26 Feb 2014 14:45:22 +0000 -Subject: [PATCH] Normalize spaces on when reading a chat packet - - -diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java -index d419f0f..b26c290 100644 ---- a/src/main/java/net/minecraft/server/PacketPlayInChat.java -+++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java -@@ -17,7 +17,7 @@ public class PacketPlayInChat extends Packet { - } - - public void a(PacketDataSerializer packetdataserializer) throws IOException { // CraftBukkit - added throws -- this.message = packetdataserializer.c(100); -+ this.message = org.apache.commons.lang.StringUtils.normalizeSpace( packetdataserializer.c( 100 ) ); // Spigot - } - - public void b(PacketDataSerializer packetdataserializer) throws IOException { // CraftBukkit - added throws -diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 652f7a1..68c1f27 100644 ---- a/src/main/java/net/minecraft/server/PlayerConnection.java -+++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -792,7 +792,7 @@ public class PlayerConnection implements PacketPlayInListener { - this.player.v(); - String s = packetplayinchat.c(); - -- s = StringUtils.normalizeSpace(s); -+ // s = StringUtils.normalizeSpace(s); Spigot - Moved to PacketPlayInChat - - for (int i = 0; i < s.length(); ++i) { - if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) { --- -1.9.1 - diff --git a/CraftBukkit-Patches/0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 94% rename from CraftBukkit-Patches/0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 72c5c8c4f2..2099cca282 100644 --- a/CraftBukkit-Patches/0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 0571c76298ab24e886ea01e10d98247640eeca0a Mon Sep 17 00:00:00 2001 +From 799336a6fdbd9687f7c279aaf12e216841a5ff27 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 2 Mar 2014 21:13:46 +0100 Subject: [PATCH] Use one PermissibleBase for all Command Blocks diff --git a/CraftBukkit-Patches/0107-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0106-Prevent-hoppers-from-loading-chunks.patch similarity index 93% rename from CraftBukkit-Patches/0107-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0106-Prevent-hoppers-from-loading-chunks.patch index 6faada1533..54d348c0f7 100644 --- a/CraftBukkit-Patches/0107-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0106-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 71f6a24e3236699189ff43b1bd0918491969c900 Mon Sep 17 00:00:00 2001 +From 747b675639b7fbf0f17edf9f00c0d96e1ca5ff1a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 5 Mar 2014 20:27:27 +0000 Subject: [PATCH] Prevent hoppers from loading chunks diff --git a/CraftBukkit-Patches/0108-Guard-Entity-List.patch b/CraftBukkit-Patches/0107-Guard-Entity-List.patch similarity index 97% rename from CraftBukkit-Patches/0108-Guard-Entity-List.patch rename to CraftBukkit-Patches/0107-Guard-Entity-List.patch index b6ddce11ee..92d7749e03 100644 --- a/CraftBukkit-Patches/0108-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0107-Guard-Entity-List.patch @@ -1,4 +1,4 @@ -From f8bb6e2b0705e799b586ffa687cb0642b2107c22 Mon Sep 17 00:00:00 2001 +From 5b32db6f24afeaabf5d2d43778d4436de3cff6fc Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/CraftBukkit-Patches/0109-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0108-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 96% rename from CraftBukkit-Patches/0109-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0108-Fix-ConcurrentModificationException-while-being-idle.patch index e96225e76f..61b5804355 100644 --- a/CraftBukkit-Patches/0109-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0108-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 4d8c8f9aa54f446f4d8e8e2736b1728c34c31deb Mon Sep 17 00:00:00 2001 +From 200790a8046f0753d75f08cd8fc7fcfa923771b4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/CraftBukkit-Patches/0110-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0109-Cancellable-WitherSkull-potion-effect.patch similarity index 96% rename from CraftBukkit-Patches/0110-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0109-Cancellable-WitherSkull-potion-effect.patch index 58d569428b..fc13f90856 100644 --- a/CraftBukkit-Patches/0110-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0109-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 79aa2f374c703826e1b7d059d2900ebb5683dc49 Mon Sep 17 00:00:00 2001 +From 4caf32f5cb86d99be688374c6f7f23c51c5b87e7 Mon Sep 17 00:00:00 2001 From: drXor Date: Tue, 25 Feb 2014 15:15:26 -0400 Subject: [PATCH] Cancellable WitherSkull potion effect diff --git a/CraftBukkit-Patches/0111-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0110-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 96% rename from CraftBukkit-Patches/0111-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0110-Descriptive-kick-reasons-instead-of-Nope.patch index 2e59ad1b92..4106f5148c 100644 --- a/CraftBukkit-Patches/0111-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0110-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 4d865bdc4f4b2e84c42c5f8d11da779a10b15776 Mon Sep 17 00:00:00 2001 +From 5e20b001874e3bd4ec3b4d0c709e8382257d9178 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! @@ -27,7 +27,7 @@ index c542460..961927b 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 68c1f27..51ba843 100644 +index dad69ac..2f6449e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -184,7 +184,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0112-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0111-Check-for-manually-prefixed-commands-or-commands-tha.patch similarity index 95% rename from CraftBukkit-Patches/0112-Check-for-manually-prefixed-commands-or-commands-tha.patch rename to CraftBukkit-Patches/0111-Check-for-manually-prefixed-commands-or-commands-tha.patch index f8b64d1c82..134e84b1da 100644 --- a/CraftBukkit-Patches/0112-Check-for-manually-prefixed-commands-or-commands-tha.patch +++ b/CraftBukkit-Patches/0111-Check-for-manually-prefixed-commands-or-commands-tha.patch @@ -1,4 +1,4 @@ -From 967f8f3f3602a2218d7f0e0430360c1f1b2379bc Mon Sep 17 00:00:00 2001 +From 699d1bd9c9c22b923c57d7e25875ddd32d3d922f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 01:12:10 +0000 Subject: [PATCH] Check for manually prefixed commands or commands that don't diff --git a/CraftBukkit-Patches/0113-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0112-Cap-window-names-to-prevent-client-disconnects.patch similarity index 93% rename from CraftBukkit-Patches/0113-Cap-window-names-to-prevent-client-disconnects.patch rename to CraftBukkit-Patches/0112-Cap-window-names-to-prevent-client-disconnects.patch index 1857a5f9ba..18de698cab 100644 --- a/CraftBukkit-Patches/0113-Cap-window-names-to-prevent-client-disconnects.patch +++ b/CraftBukkit-Patches/0112-Cap-window-names-to-prevent-client-disconnects.patch @@ -1,4 +1,4 @@ -From 64124b6baf4bb7a6bb9d12cdc2d8a939df5f5b3e Mon Sep 17 00:00:00 2001 +From 7fc41814a8f9d95b7afd30d387dbdbc438a11c8f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 10:53:48 +0000 Subject: [PATCH] Cap window names to prevent client disconnects diff --git a/CraftBukkit-Patches/0114-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0113-Enable-Improved-Ping-Sending.patch similarity index 97% rename from CraftBukkit-Patches/0114-Enable-Improved-Ping-Sending.patch rename to CraftBukkit-Patches/0113-Enable-Improved-Ping-Sending.patch index 78050c05f7..3123ed3b3b 100644 --- a/CraftBukkit-Patches/0114-Enable-Improved-Ping-Sending.patch +++ b/CraftBukkit-Patches/0113-Enable-Improved-Ping-Sending.patch @@ -1,4 +1,4 @@ -From 694229c193465042c95d90c33dd15b354ddae49d Mon Sep 17 00:00:00 2001 +From e5d733c9605e34ad079ea1223241f187b5546833 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/0115-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0114-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 98% rename from CraftBukkit-Patches/0115-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0114-Configurable-dragon-death-and-wither-spawn-sounds.patch index be62fc5d24..2b67b3746c 100644 --- a/CraftBukkit-Patches/0115-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0114-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 51d0cf0c12b0705fa0252a3b144e405baf4e7a86 Mon Sep 17 00:00:00 2001 +From 853b83fe25a31dd0c9a702b32aa8487dbe00fa47 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch similarity index 95% rename from CraftBukkit-Patches/0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch rename to CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch index 737ca2a63e..1f85c2da16 100644 --- a/CraftBukkit-Patches/0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch +++ b/CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch @@ -1,4 +1,4 @@ -From 4f24bb05650bebb0a4791103d0edaa51d4ed90c7 Mon Sep 17 00:00:00 2001 +From 46d77f4798eef547b30a250a71e8a91c88bcd742 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 23 Mar 2014 01:49:13 +0100 Subject: [PATCH] Fix TileEntities getting ticked after being queued for diff --git a/CraftBukkit-Patches/0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 92% rename from CraftBukkit-Patches/0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 063e754f40..04f195ac6a 100644 --- a/CraftBukkit-Patches/0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From c5f3488cc255f9ac1ec04bf69a73ad1609639c35 Mon Sep 17 00:00:00 2001 +From d49531ce73bdaa0dce7c687d4ee4908ca274e58a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/CraftBukkit-Patches/0118-Old-New-Version-Support.patch b/CraftBukkit-Patches/0117-Old-New-Version-Support.patch similarity index 99% rename from CraftBukkit-Patches/0118-Old-New-Version-Support.patch rename to CraftBukkit-Patches/0117-Old-New-Version-Support.patch index ded73c234a..4abb1d52ba 100644 --- a/CraftBukkit-Patches/0118-Old-New-Version-Support.patch +++ b/CraftBukkit-Patches/0117-Old-New-Version-Support.patch @@ -1,4 +1,4 @@ -From 1542fc3959303de148140f1e32925083db1ee346 Mon Sep 17 00:00:00 2001 +From 931e0c81803ef91fe863b7f809e209418adb6286 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 15:11:15 +1000 Subject: [PATCH] Old / New Version Support. diff --git a/CraftBukkit-Patches/0119-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0118-Treat-Bungee-as-Online-Mode.patch similarity index 94% rename from CraftBukkit-Patches/0119-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0118-Treat-Bungee-as-Online-Mode.patch index 7c9c10f9ba..ee16229d88 100644 --- a/CraftBukkit-Patches/0119-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0118-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From 8bc1c8631c896b2f644c4c1d33a35799b2e7b6ac Mon Sep 17 00:00:00 2001 +From a2d842a297f1a3fb9e14121f6a140c0e00ea28c7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode diff --git a/CraftBukkit-Patches/0120-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch similarity index 97% rename from CraftBukkit-Patches/0120-Fix-several-occurances-of-missed-diff.patch rename to CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch index b2040a2ef5..62410d7cf9 100644 --- a/CraftBukkit-Patches/0120-Fix-several-occurances-of-missed-diff.patch +++ b/CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch @@ -1,4 +1,4 @@ -From 05ee68a5268bc100a971c9120f1e2ae38aa31c71 Mon Sep 17 00:00:00 2001 +From fec762e0e6654930be9068e49babcc697e778651 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 17:49:14 +1000 Subject: [PATCH] Fix several occurances of missed diff. @@ -44,7 +44,7 @@ index 0f1bcc7..5eb893f 100644 public void setItemStack(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 51ba843..8039bee 100644 +index 2f6449e..58ae547 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1740,7 +1740,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch similarity index 97% rename from CraftBukkit-Patches/0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch rename to CraftBukkit-Patches/0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch index edce8c88fe..bab9c789c5 100644 --- a/CraftBukkit-Patches/0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch +++ b/CraftBukkit-Patches/0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch @@ -1,4 +1,4 @@ -From 1656b1552966abb331afceb9168e2ffc1959e101 Mon Sep 17 00:00:00 2001 +From 9d3b6ecfb30781d5dc72ae6c3b3f53afe8edc0b4 Mon Sep 17 00:00:00 2001 From: myiume Date: Wed, 19 Feb 2014 15:40:37 +0200 Subject: [PATCH] Fix PlayerFishEvent not properly cancelling. Fixes diff --git a/CraftBukkit-Patches/0122-Update-Warning.patch b/CraftBukkit-Patches/0121-Update-Warning.patch similarity index 97% rename from CraftBukkit-Patches/0122-Update-Warning.patch rename to CraftBukkit-Patches/0121-Update-Warning.patch index d9fb578744..d9401756c2 100644 --- a/CraftBukkit-Patches/0122-Update-Warning.patch +++ b/CraftBukkit-Patches/0121-Update-Warning.patch @@ -1,4 +1,4 @@ -From a72909ea34f09f3e84568ef4e75f86fc9570b3f7 Mon Sep 17 00:00:00 2001 +From ce79becf80b388d9b56cbf5a9f16a37c27d46a83 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:37:12 +1000 Subject: [PATCH] Update Warning diff --git a/CraftBukkit-Patches/0123-Add-Conversion-Message.patch b/CraftBukkit-Patches/0122-Add-Conversion-Message.patch similarity index 91% rename from CraftBukkit-Patches/0123-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0122-Add-Conversion-Message.patch index 22bc5d4cf1..a1b7681da3 100644 --- a/CraftBukkit-Patches/0123-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0122-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From 741919efc9f2593522022bfaa97734fa62e72d8d Mon Sep 17 00:00:00 2001 +From bfbd35e8061cc853f1deba161c1e039defb66204 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message diff --git a/CraftBukkit-Patches/0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch similarity index 94% rename from CraftBukkit-Patches/0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch rename to CraftBukkit-Patches/0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index 649cce1d80..dfeb1ab9df 100644 --- a/CraftBukkit-Patches/0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From d75e49afe86bfb6cbe02ff20bc3871e50185e263 Mon Sep 17 00:00:00 2001 +From 0eba175851493d73e028b910763a76490b877b27 Mon Sep 17 00:00:00 2001 From: "gjmcferrin@gmail.com" Date: Mon, 10 Feb 2014 10:05:11 -0500 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396 diff --git a/CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0124-Print-Stack-on-InternalException.patch similarity index 91% rename from CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0124-Print-Stack-on-InternalException.patch index f42fa9c712..7ada903644 100644 --- a/CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0124-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From a0d6415612a3f7ed22bbc82fc6a7ae2e14a1ca63 Mon Sep 17 00:00:00 2001 +From ba26e310193b36995609d15512990322d7c65ab7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException diff --git a/CraftBukkit-Patches/0126-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0125-Use-Offline-Player-Data-Once-if-Required.patch similarity index 95% rename from CraftBukkit-Patches/0126-Use-Offline-Player-Data-Once-if-Required.patch rename to CraftBukkit-Patches/0125-Use-Offline-Player-Data-Once-if-Required.patch index e623d7c425..3670e7b7c1 100644 --- a/CraftBukkit-Patches/0126-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0125-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 4a59045ce2abba675a931fc1c645a6bf8506dc9f Mon Sep 17 00:00:00 2001 +From 16452034e5dafd7f383355f3c10fd76de560ba87 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 14:41:23 +1000 Subject: [PATCH] Use Offline Player Data Once if Required. @@ -6,7 +6,7 @@ Subject: [PATCH] Use Offline Player Data Once if Required. If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again. diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 93ff8d3..cc4d487 100644 +index 93ff8d3..efdcad7 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -196,10 +196,28 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { diff --git a/CraftBukkit-Patches/0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch similarity index 92% rename from CraftBukkit-Patches/0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch rename to CraftBukkit-Patches/0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index b60f531c6e..31e1d0533f 100644 --- a/CraftBukkit-Patches/0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From 12cbab037a9a6e8fdcb01842a5fe6710cc2d2e34 Mon Sep 17 00:00:00 2001 +From 4a3230d12fb9213af05af3a8ce910b9983a72889 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0127-Check-for-blank-OfflinePlayer-Names.patch similarity index 93% rename from CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0127-Check-for-blank-OfflinePlayer-Names.patch index b709af7f31..8010ec1eee 100644 --- a/CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0127-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From 3bc7abac8731fbaf92b84aac3e38a50aceaf8647 Mon Sep 17 00:00:00 2001 +From 5b5dc34416b0f6b5d43a9a280023bfb8811c8f58 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 17:21:24 +1000 Subject: [PATCH] Check for blank OfflinePlayer Names diff --git a/CraftBukkit-Patches/0129-Fix-Player-Banning.patch b/CraftBukkit-Patches/0128-Fix-Player-Banning.patch similarity index 96% rename from CraftBukkit-Patches/0129-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0128-Fix-Player-Banning.patch index a14954c1a8..045fcb10d4 100644 --- a/CraftBukkit-Patches/0129-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0128-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 2a50cd4623119094130a0133120b351f37ce5188 Mon Sep 17 00:00:00 2001 +From c75f7db7cb7f4c075eaa98d94408d4b9758b7f84 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning diff --git a/CraftBukkit-Patches/0130-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0129-Fix-ban-expire-dates.patch similarity index 92% rename from CraftBukkit-Patches/0130-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0129-Fix-ban-expire-dates.patch index bea80af767..add12d6fb3 100644 --- a/CraftBukkit-Patches/0130-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0129-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 7452d9cfab74a596456657f225f34954611cc16b Mon Sep 17 00:00:00 2001 +From c48761b57184d799e1466fe71ca77790f3e6cf3b Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 10:09:56 +1000 Subject: [PATCH] Fix ban expire dates. diff --git a/CraftBukkit-Patches/0131-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0130-Correct-Ban-Expiration.patch similarity index 93% rename from CraftBukkit-Patches/0131-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0130-Correct-Ban-Expiration.patch index 64637af216..650dd41eae 100644 --- a/CraftBukkit-Patches/0131-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0130-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From 476e839917717b4036d2482904033d28e7c2782a Mon Sep 17 00:00:00 2001 +From 688556a2c5b4b06f031eb8beed6fec1ea29ea32f Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/CraftBukkit-Patches/0132-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch similarity index 94% rename from CraftBukkit-Patches/0132-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch index 9afe1cf0bc..6b11c1f4d6 100644 --- a/CraftBukkit-Patches/0132-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From 90a0b287ba00d8e3d17dc19e9c21e51ae01a03a3 Mon Sep 17 00:00:00 2001 +From ecd3b9da7c4b9813bfe22dbbca61acbb5a17c83f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 Apr 2014 01:40:30 -0400 Subject: [PATCH] Convert Horses owner to UUID diff --git a/CraftBukkit-Patches/0133-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0132-Expand-team-API-to-allow-arbitrary-strings.patch similarity index 98% rename from CraftBukkit-Patches/0133-Expand-team-API-to-allow-arbitrary-strings.patch rename to CraftBukkit-Patches/0132-Expand-team-API-to-allow-arbitrary-strings.patch index dbe40b4cf1..f78252283f 100644 --- a/CraftBukkit-Patches/0133-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0132-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From fed705bb9045b02db7f2c8b9304cca756d98c027 Mon Sep 17 00:00:00 2001 +From eb571f2f2b6881b77d95492a77f3b73eae5a57e4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:22 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/CraftBukkit-Patches/0134-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0133-Add-Score.isScoreSet-Z-API.patch similarity index 96% rename from CraftBukkit-Patches/0134-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0133-Add-Score.isScoreSet-Z-API.patch index ff577ff172..62962e781f 100644 --- a/CraftBukkit-Patches/0134-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0133-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From e90495528c8e1825a76d06ff3c6a570dc0fec2f1 Mon Sep 17 00:00:00 2001 +From aadd0aa5e87fe8e1d6d130c47bae53a207634721 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/CraftBukkit-Patches/0135-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0134-Log-null-TileEntity-Owner.patch similarity index 94% rename from CraftBukkit-Patches/0135-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0134-Log-null-TileEntity-Owner.patch index ac3c99df62..ae78ede45e 100644 --- a/CraftBukkit-Patches/0135-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0134-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From 4eb71b4d0c00aeb1321db3aa9d88802adfc6729b Mon Sep 17 00:00:00 2001 +From 56dd3bfecff92f6da808807057d11c33bc63b4d3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 11:16:54 +1000 Subject: [PATCH] Log null TileEntity Owner diff --git a/CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch similarity index 96% rename from CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch rename to CraftBukkit-Patches/0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch index f34825b5f1..a74c410d72 100644 --- a/CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From 3d84c65fcb556615aacd378348240fffb8611f33 Mon Sep 17 00:00:00 2001 +From cb7d74c21d70f489a2a9031d63ab929370ae98d0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs. diff --git a/CraftBukkit-Patches/0137-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0136-Convert-player-skulls-async.patch similarity index 98% rename from CraftBukkit-Patches/0137-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0136-Convert-player-skulls-async.patch index 05d682ebd6..880e0c544b 100644 --- a/CraftBukkit-Patches/0137-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0136-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From d2cf3dd0f6af93ba451c822b98d12915cdd77490 Mon Sep 17 00:00:00 2001 +From 6c5aedbf683a97a43a001c8765154d810dc42d46 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async diff --git a/CraftBukkit-Patches/0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch similarity index 97% rename from CraftBukkit-Patches/0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch rename to CraftBukkit-Patches/0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 189a804303..71994afc32 100644 --- a/CraftBukkit-Patches/0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,4 +1,4 @@ -From 2dab006c4c4e19bf855cf834866b7a66c0c5c88c Mon Sep 17 00:00:00 2001 +From dbe079e5ee8a410fca79db006bde74fbdbae3f9c Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/CraftBukkit-Patches/0139-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0138-Check-Skull-canPlace.patch similarity index 92% rename from CraftBukkit-Patches/0139-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0138-Check-Skull-canPlace.patch index ff22a1cb88..4641f336a3 100644 --- a/CraftBukkit-Patches/0139-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0138-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From e6f4942654a0976d162e95a63d0b237980873bdb Mon Sep 17 00:00:00 2001 +From b835696485dcca66dc6e9be1d76078067a2f7ffd Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:48:35 +1000 Subject: [PATCH] Check Skull canPlace diff --git a/CraftBukkit-Patches/0140-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch similarity index 95% rename from CraftBukkit-Patches/0140-Don-t-let-trees-replace-any-block.patch rename to CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch index c931e1cb69..1dac20b1dd 100644 --- a/CraftBukkit-Patches/0140-Don-t-let-trees-replace-any-block.patch +++ b/CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch @@ -1,4 +1,4 @@ -From df36bc3caccde18ea3af8538283e536f110d7054 Mon Sep 17 00:00:00 2001 +From b19714fdfdca0f8cb4db05bf7ad94114fe414410 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 20 Jan 2014 20:42:28 +0000 Subject: [PATCH] Don't let trees replace any block. diff --git a/CraftBukkit-Patches/0141-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0140-Fix-race-condition-that-could-kill-connections-befor.patch similarity index 97% rename from CraftBukkit-Patches/0141-Fix-race-condition-that-could-kill-connections-befor.patch rename to CraftBukkit-Patches/0140-Fix-race-condition-that-could-kill-connections-befor.patch index 03a4182a56..36f1030f93 100644 --- a/CraftBukkit-Patches/0141-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0140-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 328030d673f12b3a3762f02fe2eb24b5d25bf1ba Mon Sep 17 00:00:00 2001 +From 04ed5e79aeca80f333d0e77ed7d515823bbfbb49 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they diff --git a/CraftBukkit-Patches/0142-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0141-Configurable-UserCache-cap.patch similarity index 95% rename from CraftBukkit-Patches/0142-Configurable-UserCache-cap.patch rename to CraftBukkit-Patches/0141-Configurable-UserCache-cap.patch index 8439b83c36..5003806f46 100644 --- a/CraftBukkit-Patches/0142-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0141-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From 9c42740a7ec62bf9e2bd8cf28ff29b02be8c98ed Mon Sep 17 00:00:00 2001 +From 1628159293d9e528cfdb23dd1a98a45cac8394c3 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap diff --git a/CraftBukkit-Patches/0143-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0142-Implement-PlayerSpawnLocationEvent.patch similarity index 96% rename from CraftBukkit-Patches/0143-Implement-PlayerSpawnLocationEvent.patch rename to CraftBukkit-Patches/0142-Implement-PlayerSpawnLocationEvent.patch index a3a67aeebe..401e6f8b9c 100644 --- a/CraftBukkit-Patches/0143-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0142-Implement-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 936a1c01475e1e77f038183c27e882e7bb47a912 Mon Sep 17 00:00:00 2001 +From 3997f4f83249d089f5a97aea09af25170e6b3433 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:05:19 +0200 Subject: [PATCH] Implement PlayerSpawnLocationEvent. diff --git a/CraftBukkit-Patches/0144-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0143-Cap-Objective-Score-Length.patch similarity index 94% rename from CraftBukkit-Patches/0144-Cap-Objective-Score-Length.patch rename to CraftBukkit-Patches/0143-Cap-Objective-Score-Length.patch index ccca60137e..d156f06c34 100644 --- a/CraftBukkit-Patches/0144-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0143-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From 101f1c846399b878f4b072bba2ed37c959986aa2 Mon Sep 17 00:00:00 2001 +From 305cd6fa0f2fb9a2286251694183544f1454d0ee Mon Sep 17 00:00:00 2001 From: hauno Date: Tue, 6 May 2014 18:01:37 -0700 Subject: [PATCH] Cap Objective Score Length diff --git a/CraftBukkit-Patches/0145-Check-the-right-banlist-for-ip-bans.patch b/CraftBukkit-Patches/0144-Check-the-right-banlist-for-ip-bans.patch similarity index 94% rename from CraftBukkit-Patches/0145-Check-the-right-banlist-for-ip-bans.patch rename to CraftBukkit-Patches/0144-Check-the-right-banlist-for-ip-bans.patch index 26ec41abb2..89f55ebfae 100644 --- a/CraftBukkit-Patches/0145-Check-the-right-banlist-for-ip-bans.patch +++ b/CraftBukkit-Patches/0144-Check-the-right-banlist-for-ip-bans.patch @@ -1,4 +1,4 @@ -From 326d13051cea60336e4ab939f36aedadd1629e24 Mon Sep 17 00:00:00 2001 +From 424548c7c1f6846f867874f3fecc3d706bf5b9b2 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 7 May 2014 23:33:46 +0100 Subject: [PATCH] Check the right banlist for ip bans