diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 37be288..9e68eda 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From da920140348518cc56573db48a2e19fcbdc1b96a Mon Sep 17 00:00:00 2001 +From 43ea4b8812178c2ba6431f28b9b492138335538e 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/pom.xml b/pom.xml -index 6f1dc61..dc430c0 100644 +index a2bdfbc..70d5ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ @@ -16,7 +16,7 @@ index 6f1dc61..dc430c0 100644 - bukkit + org.spigotmc + spigot-api - 1.8.7-R0.1-SNAPSHOT + 1.8.8-R0.1-SNAPSHOT jar - Bukkit diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch index 35291d3..cf20796 100644 --- a/Bukkit-Patches/0002-Spigot-Timings.patch +++ b/Bukkit-Patches/0002-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 1f187a6f5feeb611db31a38403d521bfb4b50daa Mon Sep 17 00:00:00 2001 +From 211f814d9a23e5695608c46834f2c30c2cfc4869 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 2 Jun 2013 10:42:57 +1000 Subject: [PATCH] Spigot Timings diff --git a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch index cc0647e..c4b765e 100644 --- a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From d1fb850ed9fe49904a166451978cf4701fc66069 Mon Sep 17 00:00:00 2001 +From 2d16a2bd0871f1eb71f53b0f2949a99269f0dbda Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:31:20 +1100 Subject: [PATCH] Add PlayerItemDamageEvent diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch index cda9859..49ba757 100644 --- a/Bukkit-Patches/0004-BungeeCord-Support.patch +++ b/Bukkit-Patches/0004-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 50ea9ab7498d7790cf3cdc882eb2f7cff3dd6d73 Mon Sep 17 00:00:00 2001 +From b351cd2f9562eff94b8a32f0f3cf1c066cd48690 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/0005-Add-Arrow-API.patch b/Bukkit-Patches/0005-Add-Arrow-API.patch index 18c111f..6ed550f 100644 --- a/Bukkit-Patches/0005-Add-Arrow-API.patch +++ b/Bukkit-Patches/0005-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 6df1a1942db9ba0c51f5d0d44755e7fc6c178b1f Mon Sep 17 00:00:00 2001 +From 5a6f3e6ac8d2c3b6a5600e89231a293af7ce03c8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:08:24 +1000 Subject: [PATCH] Add Arrow API diff --git a/Bukkit-Patches/0006-Add-Particle-API.patch b/Bukkit-Patches/0006-Add-Particle-API.patch index ecfe611..542f038 100644 --- a/Bukkit-Patches/0006-Add-Particle-API.patch +++ b/Bukkit-Patches/0006-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From ae09c30b8e2662ceb485199d761d4c8aa021ee87 Mon Sep 17 00:00:00 2001 +From b46e9679728dcaa4782c6ce491897cfc8c978ab2 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/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch index 688de66..a7517c4 100644 --- a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 881e18a4165bda3606d6f8a56b70fdda366d1570 Mon Sep 17 00:00:00 2001 +From e982d761707c7b217a88c4f9238feeaeaba4858d 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/0008-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch index db7ec6f..c894161 100644 --- a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch +++ b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From 25b939248a75194bf269587f6b32967ff9dd50a0 Mon Sep 17 00:00:00 2001 +From 246b47b22a286b0e8bd36082f636a6edeb3d7284 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 diff --git a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch index 36de9c6..c57ccf7 100644 --- a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From 448b8cd86c63dc50bf5479506b85814595387256 Mon Sep 17 00:00:00 2001 +From 8a80ebccc9555a300c001caf8a8984f12a86f326 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 7 Jul 2013 10:32:05 -0400 Subject: [PATCH] InventoryClickEvent getClickedInventory diff --git a/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch b/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch index db278ff..9fb4893 100644 --- a/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch +++ b/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch @@ -1,4 +1,4 @@ -From c502417b8d25ebeb61357371aeec2e64d71aec25 Mon Sep 17 00:00:00 2001 +From 0244c6a138d2d14eebedef0b3fa06570d1772e87 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/0011-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch index ba8a5d0..b147a45 100644 --- a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch @@ -1,4 +1,4 @@ -From dae3333416b4cb55f40217339e635d32f9516864 Mon Sep 17 00:00:00 2001 +From f58f3bf04a2bb21880cc76e09196a57eddc44c6d 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/0012-Player-Collision-API.patch b/Bukkit-Patches/0012-Player-Collision-API.patch index cc9e86e..c43fb93 100644 --- a/Bukkit-Patches/0012-Player-Collision-API.patch +++ b/Bukkit-Patches/0012-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From c4a87449c9728a19bcff5ba01db04343a02189a1 Mon Sep 17 00:00:00 2001 +From 6cac32aab7e7270acc0c3a3802a833007301a755 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/0013-Expand-Boolean-Prompt-Values.patch b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch index 97d4640..825ea2c 100644 --- a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From 8b2b862220b72654e09a83db71a8480dea4b374f Mon Sep 17 00:00:00 2001 +From cbb9593827fba7ecf040fab1fc0a0794a78345c2 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/0014-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch index 93eadc9..45882b4 100644 --- a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 33bcec116a7d0b271a247aa325c288cebceab936 Mon Sep 17 00:00:00 2001 +From 3058e4ccec6de64c7c0a94fefecebaf76cae104c 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/0015-Add-respawn-API.patch b/Bukkit-Patches/0015-Add-respawn-API.patch index 6f5c2a4..789ef45 100644 --- a/Bukkit-Patches/0015-Add-respawn-API.patch +++ b/Bukkit-Patches/0015-Add-respawn-API.patch @@ -1,4 +1,4 @@ -From 4d98b3bae2ce9e01b5fe2ea35d8c43b297a07698 Mon Sep 17 00:00:00 2001 +From 76c4f71d40ca15b885666c5425f5b3c8a6269b26 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/0016-Fix-Plugin-Message-API-Disconnects.patch b/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch index 52c8e65..d8cc7ab 100644 --- a/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch +++ b/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch @@ -1,4 +1,4 @@ -From cbf5dc1f5e2241264419592fdc12a73997f270bb Mon Sep 17 00:00:00 2001 +From 32283d1dd78f712e95675f00ae2241651ec87068 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/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch b/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch index cd6ad22..0b8129b 100644 --- a/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch +++ b/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch @@ -1,4 +1,4 @@ -From 183a4b3be424e009fc996e7baf6d88de15805652 Mon Sep 17 00:00:00 2001 +From baf98de9c6282b4a8d61b2c853fd2fb070b9a180 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 24 Dec 2013 10:14:25 +1100 Subject: [PATCH] Fix Tab Completion for Some Commands diff --git a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch index c1cbcd7..304dbfe 100644 --- a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch +++ b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 569fe828e8596f8d4773f725c4c9cd8555a6d628 Mon Sep 17 00:00:00 2001 +From 32427451524d58b5096de3be5a98c1a9041dcacd Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:10:49 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch index 3add691..bcf9603 100644 --- a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch +++ b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 96031401a0d28d40685afecf100e521e044f0753 Mon Sep 17 00:00:00 2001 +From ced760bab62605d3cccbf4886a70d3d9f0e272a5 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:02:11 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch index 5edb992..9db001c 100644 --- a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 2da3867ab296fef727f7a85a2af2f8c08ad5552c Mon Sep 17 00:00:00 2001 +From b7f82738214b66303a80cf45d071c43cefce2e4c Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API diff --git a/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch index a233f6f..a5824e3 100644 --- a/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch +++ b/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch @@ -1,4 +1,4 @@ -From 59c2dab8155fa5d479c75d45ffbcc719fd5d4871 Mon Sep 17 00:00:00 2001 +From 993b4ff544073462f7d9b0aae0eb4464c32e3170 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Mar 2014 15:58:22 +1100 Subject: [PATCH] Remove deprecation on some player lookup methods @@ -6,7 +6,7 @@ Subject: [PATCH] Remove deprecation on some player lookup methods Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index af5fe07..2ab17db 100644 +index c535498..95d8c80 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -372,12 +372,9 @@ public final class Bukkit { @@ -49,7 +49,7 @@ index af5fe07..2ab17db 100644 return server.matchPlayer(name); } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a57d506..57b2794 100644 +index 2892a28..52dd005 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -308,23 +308,17 @@ public interface Server extends PluginMessageRecipient { diff --git a/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch index 3188080..016cb47 100644 --- a/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch +++ b/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 13cf271e46dd3ab8974491f621a5be427e40e5ce Mon Sep 17 00:00:00 2001 +From e9305a7a4988acd7f73e0c444d1237409bb51db4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:13 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch index 7853013..b28ea88 100644 --- a/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch +++ b/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From bd34256ce7ea719485ccfe6819ac71e75eb438a2 Mon Sep 17 00:00:00 2001 +From 5a4a84f14e3fc0cb1b60b6d8d9e5b65055e107a9 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:01:32 +0200 Subject: [PATCH] Add PlayerSpawnLocationEvent. diff --git a/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch index 91f9072..321424e 100644 --- a/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch +++ b/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch @@ -1,4 +1,4 @@ -From 0e0c236ada77b513050d04b43f9fb37ba87f9a67 Mon Sep 17 00:00:00 2001 +From 39d5351db6c384a64b5de29d3ebc45ceb4fbcee7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Jul 2014 17:24:21 +1000 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible diff --git a/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch index 7971b3b..aef256e 100644 --- a/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch +++ b/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch @@ -1,4 +1,4 @@ -From 774a23e8786db836f122b52878efb4ee6c09d5de Mon Sep 17 00:00:00 2001 +From f68a6b171088758dfab21917b1028246fcbfd6af Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 22 Jul 2014 21:01:32 +1000 Subject: [PATCH] Fix slow tab complete for some commands. diff --git a/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch index 7646f7a..43cdf1e 100644 --- a/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch +++ b/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch @@ -1,11 +1,11 @@ -From 249eb8be0d33847f7d0cde8fd493d63870ddb29f Mon Sep 17 00:00:00 2001 +From 9cb8116240b7afad0bf933eae153b6c61daf6921 Mon Sep 17 00:00:00 2001 From: drXor Date: Wed, 23 Jul 2014 15:50:36 -0400 Subject: [PATCH] Undeprecate Player#updateInventory()V diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2d67970..7a0815c 100644 +index 0f59c07..d429074 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -333,10 +333,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline diff --git a/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 4088745..25b0917 100644 --- a/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 9b7a6f1d7eb97b23e5322809c9b2345bcc8da128 Mon Sep 17 00:00:00 2001 +From d4f00fcaa6e46a323a4e5a11427fd76ff80df8e2 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:31:04 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch index 8fbab11..156cdfe 100644 --- a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch @@ -1,11 +1,11 @@ -From 19ad28e2723089c484b88d70248d3c62aa2e2e69 Mon Sep 17 00:00:00 2001 +From 1c89d256fb6b6aa3b2c1a210af6c0f802473a657 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 12:59:14 +1100 Subject: [PATCH] BungeeCord Chat API diff --git a/pom.xml b/pom.xml -index dc430c0..f0ceea5 100644 +index 70d5ff8..cb142f2 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,14 @@ diff --git a/Bukkit-Patches/0029-Add-restart-API.patch b/Bukkit-Patches/0029-Add-restart-API.patch index 0b50986..f1c52e2 100644 --- a/Bukkit-Patches/0029-Add-restart-API.patch +++ b/Bukkit-Patches/0029-Add-restart-API.patch @@ -1,4 +1,4 @@ -From c4395cc09f91e55af6791c7f9490237ba393c73c Mon Sep 17 00:00:00 2001 +From 5fd845e883d1a8bdb75272d43f02cf42786f9bb3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 13 Jul 2015 19:10:15 +1000 Subject: [PATCH] Add restart API. diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 7974a72..9633571 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From c579a83622e1fce7be3620a36c86b763eedd06fc Mon Sep 17 00:00:00 2001 +From 2bb58d91916cf4390bef54569377f5623dbead53 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes @@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us. diff --git a/pom.xml b/pom.xml -index 2c04579..0e0fd09 100644 +index f1fb28f..91627ff 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -18,7 +18,7 @@ index 2c04579..0e0fd09 100644 + org.spigotmc + spigot jar - 1.8.7-R0.1-SNAPSHOT + 1.8.8-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index 5369c54..d2765c4 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From e38edc080646fbffb49e6f6ea44f3c4d89a21b08 Mon Sep 17 00:00:00 2001 +From f11a143d3addb06ea169772e070441fabd20114d 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 b7adf75..2bc659b 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 8cbecffde39ed8b6dd830dc48553a3f7f825aeeb Mon Sep 17 00:00:00 2001 +From 458fc7928b658349c076603609fa98fdec6e1a39 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-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch index 99e68c1..1fbfa86 100644 --- a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch +++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch @@ -1,4 +1,4 @@ -From 14b000ffaedc98dd7a8b50a6b629d10a4f9d3afb Mon Sep 17 00:00:00 2001 +From 6fc7e7a2d7a52bf18cc053d9e045689c15e04c59 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 10:38:04 +1000 Subject: [PATCH] Obfuscation Helpers @@ -6,7 +6,7 @@ Subject: [PATCH] Obfuscation Helpers Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c7e8914..6199d30 100644 +index b99d043..f4d8254 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1286,6 +1286,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index a1f86fc..46b5c42 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From e9ca76fd7f1f247f6219b8ded77f9532ff5ae785 Mon Sep 17 00:00:00 2001 +From fba1662e39217ab5d0f5db399286c8ee22ba77aa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 05ea307..7e93c95 100644 +index 5402532..187d2f4 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -162,6 +162,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch index 7fd7911..de642c4 100644 --- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch @@ -1,4 +1,4 @@ -From fc11bf525b271e692201fea7e805e53f3ad5900f Mon Sep 17 00:00:00 2001 +From 426206c162bab9cdffb452562b8ec8f608e76655 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection An optimized chunk ticking algorithm which better selects chunks around players which are active on the server. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0356d9e..11e072b 100644 +index 1638081..5cb66a5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess { @@ -111,7 +111,7 @@ index 0356d9e..11e072b 100644 this.methodProfiler.b(); if (this.L > 0) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5faefba..03cac6e 100644 +index d27aa67..690e7dc 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -357,12 +357,15 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch index d8c3459..a37eb84 100644 --- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From e78adc4dd3cd3cc942950f5ada5d889ed631faf9 Mon Sep 17 00:00:00 2001 +From ceea89b9500f590905200814f6e7310c7a7fd2e3 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/0008-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch index d51d9df..936d518 100644 --- a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 69f41b5a824a8cd70b667f338cf00712a4e56ca8 Mon Sep 17 00:00:00 2001 +From 132c9f128e9b958ba9161738329c811f68553833 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration diff --git a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch index 0894643..cf5d689 100644 --- a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 6cf841d064ceb73000411b4ff9832675da0fd2d6 Mon Sep 17 00:00:00 2001 +From 4465c430d6b6e15762957e595385cc4fd7e7dbc2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching diff --git a/CraftBukkit-Patches/0010-View-Distance.patch b/CraftBukkit-Patches/0010-View-Distance.patch index ae87f45..17e5600 100644 --- a/CraftBukkit-Patches/0010-View-Distance.patch +++ b/CraftBukkit-Patches/0010-View-Distance.patch @@ -1,4 +1,4 @@ -From 8eceef159a4bb5b2d8f481611a996f59b05b2cd2 Mon Sep 17 00:00:00 2001 +From f738cff112c9dc5e25b93334c91f953914a805b0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -22,7 +22,7 @@ index 688d6f0..abb24c8 100644 public WorldServer a() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 03cac6e..b245159 100644 +index 690e7dc..9c0bcfe 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -62,7 +62,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0011-Spigot-Timings.patch b/CraftBukkit-Patches/0011-Spigot-Timings.patch index 43d4404..f2eff13 100644 --- a/CraftBukkit-Patches/0011-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0011-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From b3599f9bef1fe723ec620dcb375098821b2106f9 Mon Sep 17 00:00:00 2001 +From 7661b4adec73bb002c6d5c285781c5162c9d817b Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -56,10 +56,10 @@ index 0ae736d..af77eef 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index cfd28f1..ad989e6 100644 +index 706d976..206e3aa 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -@@ -41,7 +41,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -42,7 +42,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { // CraftBukkit start - Add async variant, provide compatibility public Chunk a(World world, int i, int j) throws IOException { @@ -69,7 +69,7 @@ index cfd28f1..ad989e6 100644 if (data != null) { Chunk chunk = (Chunk) data[0]; NBTTagCompound nbttagcompound = (NBTTagCompound) data[1]; -@@ -379,7 +381,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -392,7 +394,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) { // CraftBukkit end @@ -78,7 +78,7 @@ index cfd28f1..ad989e6 100644 NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10); if (nbttaglist1 != null) { -@@ -405,7 +407,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -418,7 +420,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -88,7 +88,7 @@ index cfd28f1..ad989e6 100644 NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10); if (nbttaglist2 != null) { -@@ -418,6 +421,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -431,6 +434,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -97,7 +97,7 @@ index cfd28f1..ad989e6 100644 if (nbttagcompound.hasKeyOfType("TileTicks", 9)) { NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10); -@@ -437,6 +442,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -450,6 +455,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7e93c95..38c634f 100644 +index 187d2f4..14d2207 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -20,6 +20,7 @@ import java.io.PrintStream; @@ -242,7 +242,7 @@ index 8125cb9..6ef9c83 100644 this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6199d30..a58ac4b 100644 +index f4d8254..e42c0ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -45,6 +45,7 @@ import jline.console.ConsoleReader; @@ -367,10 +367,10 @@ index 6199d30..a58ac4b 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6329672..a7ca537 100644 +index 1ee1abf..10e5032 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1077,6 +1077,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1090,6 +1090,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit end private void handleCommand(String s) { @@ -378,7 +378,7 @@ index 6329672..a7ca537 100644 // CraftBukkit start - whole method this.c.info(this.player.getName() + " issued server command: " + s); -@@ -1086,18 +1087,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1099,18 +1100,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.server.getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch index 7322f2c..e7b7ada 100644 --- a/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From d528062516b72771b4941e2e59cb02dc06cea9f0 Mon Sep 17 00:00:00 2001 +From cd53964e04b6f576d5feb91e0bc36759ec14b750 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:29:54 +1000 Subject: [PATCH] Fix Mob Spawning Relative to View Distance @@ -8,7 +8,7 @@ Changes the mob spawning algorithm to properly account for view distance and the Needs better documentation. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index f22e695..3d8d59a 100644 +index 7e7aa11..746cbce 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -42,6 +42,7 @@ public class Chunk { diff --git a/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch index b4e7792..9ec9419 100644 --- a/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch @@ -1,11 +1,11 @@ -From 5f633cd86ba8f838007c9d002cd871c047c837c1 Mon Sep 17 00:00:00 2001 +From 5846865ec3ebf4fcc2d6c35617cc6dddc6bc18a2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3e5933a..380df75 100644 +index e34964f..275856f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1365,6 +1365,13 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index 9272210..9eeafd4 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 1a625048845e34778ffdba0ad1042370f586a797 Mon Sep 17 00:00:00 2001 +From b72486af9b48b56778166d1899644ddee8d9f94b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -145,7 +145,7 @@ index aa36bf2..3c7814d 100644 super(world); this.setSize(0.25F, 0.25F); diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index c1b904d..06d4687 100644 +index 8b7cd86..b80801a 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -121,6 +121,28 @@ public class EntityItem extends Entity { @@ -196,7 +196,7 @@ index 6ef9c83..e3a9e44 100644 public void G() { this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6de46dc..221e2f2 100644 +index 275856f..b959a79 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1306,6 +1306,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0015-Metrics.patch b/CraftBukkit-Patches/0015-Metrics.patch index a906faa..46aa46a 100644 --- a/CraftBukkit-Patches/0015-Metrics.patch +++ b/CraftBukkit-Patches/0015-Metrics.patch @@ -1,4 +1,4 @@ -From adcceacaaaa05206db36e6c06c3cded1ddb31150 Mon Sep 17 00:00:00 2001 +From c5caf2c18d39f621e699a03c53e2e6d64d5ad5cb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics @@ -687,5 +687,5 @@ index cb88089..dcca493 100644 static void readConfig(Class clazz, Object instance) -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch index 1abc6b4..a13c1d7 100644 --- a/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 91a207cf310c507636fec4e119b0c4b55c3a0724 Mon Sep 17 00:00:00 2001 +From 927b1e1f6463fc52c8718735deb38f5b315c7260 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch index 3a8f97e..ccc7549 100644 --- a/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From 6d7b55496c097214f4bdb2acdee1b08c8767d2ad Mon Sep 17 00:00:00 2001 +From 6c4714ec822f04f5edd10bd57cc8db50df6d3b17 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch index 45b4aba..1a56537 100644 --- a/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 23f036658cfea94cb5d68f4522617d3a77dcd2be Mon Sep 17 00:00:00 2001 +From 98c2490b9e0db5dbcaf154bdc8d2bcba1676a2ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -12,7 +12,7 @@ This has multiple benefits: 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames. diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index de38e80..1f7dd1a 100644 +index e1ff4f0..cb72b36 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -95,6 +95,7 @@ public class EntityTracker { diff --git a/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch index b1f4b53..ec987ff 100644 --- a/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From 1b8f113603033107d6980169fd3f5b01eadbdfbb Mon Sep 17 00:00:00 2001 +From 11b631871b5943607fc15ec70a841a8af7020aa9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:50:27 +1000 Subject: [PATCH] Thread Naming and Tweaks diff --git a/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch index a1de430..ac40654 100644 --- a/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From de99b08eec3c384e0818447af13d91a1defb2004 Mon Sep 17 00:00:00 2001 +From 779b76bf2e439766383b7635b08ccc6b62398b58 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files diff --git a/CraftBukkit-Patches/0021-Remove-o-Option.patch b/CraftBukkit-Patches/0021-Remove-o-Option.patch index 026fa4a..d54e4e7 100644 --- a/CraftBukkit-Patches/0021-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0021-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From 7003a11b6d4ce715147b1ede2c6bb8ad53ca95e3 Mon Sep 17 00:00:00 2001 +From 561aaac2d5dc20515d3b4161fa880b9ba70962b0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option @@ -6,7 +6,7 @@ Subject: [PATCH] Remove -o Option Serves no purpose other than to confuse users. diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java -index dbb329c..0549a0f 100644 +index 856ae39..0ee7fe8 100644 --- a/src/main/java/net/minecraft/server/PropertyManager.java +++ b/src/main/java/net/minecraft/server/PropertyManager.java @@ -54,7 +54,7 @@ public class PropertyManager { diff --git a/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch index fca3e48..0c1887d 100644 --- a/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From 525b79b4b5bde8c12b36279773be7e2f67bdc1ad Mon Sep 17 00:00:00 2001 +From 40711de0bf9bd0111c07ac647f806bf899992af5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Jun 2013 16:34:38 +1000 Subject: [PATCH] Recipe Deconstruction diff --git a/CraftBukkit-Patches/0023-Implement-Arrow-API.patch b/CraftBukkit-Patches/0023-Implement-Arrow-API.patch index 2246b64..5abc9d1 100644 --- a/CraftBukkit-Patches/0023-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0023-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From b81ecffb87848ddccf72e3a45d41c57e62aab7dc Mon Sep 17 00:00:00 2001 +From b362f88b396a1220b9e55a48ec6ee08fb400db39 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:16:05 +1000 Subject: [PATCH] Implement Arrow API diff --git a/CraftBukkit-Patches/0024-Hopper-Customisations.patch b/CraftBukkit-Patches/0024-Hopper-Customisations.patch index f9b25a3..6734f5d 100644 --- a/CraftBukkit-Patches/0024-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0024-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From a52a850cb8198e8db2afb6c34acaa96093c6ffd7 Mon Sep 17 00:00:00 2001 +From f0d8e184d3c543840e50a775dd7aebc5b733eaba Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations diff --git a/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch index 2555fc5..76d75b1 100644 --- a/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 0278976e64dfd93bc2929ef0b820f0459a103c77 Mon Sep 17 00:00:00 2001 +From c376a82c02fe22df003b586879846358da93a822 Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent. Adds BUKKIT-267 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 056d447..0695fe2 100644 +index 7b10821..35ed213 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -4,7 +4,11 @@ import com.google.common.collect.Lists; @@ -64,7 +64,7 @@ index 056d447..0695fe2 100644 return entity; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 10ac959..c5eca56 100644 +index 2a01005..260c305 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -18,6 +18,7 @@ import org.bukkit.Statistic.Type; diff --git a/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch index c4434d0..c8f5ab7 100644 --- a/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From aa678434ade339ed00754bc9f8c80ff08d57ea6d Mon Sep 17 00:00:00 2001 +From 7de3bb97d2030311993a14f4e59c30569956d16e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 15 Jun 2013 21:34:48 +1000 Subject: [PATCH] Firework Meta Crash Fix diff --git a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch index 5b88e8c..e035118 100644 --- a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch @@ -1,14 +1,14 @@ -From 1b32b4afefa170a63a9d208a94ed43f6f3c6c0bb Mon Sep 17 00:00:00 2001 +From b33bb999524e6ccfbfdc394517e9ce7f55bc3a8c Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:01:29 +1000 Subject: [PATCH] Allow Disabling of Command Logging diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a7ca537..1fca956 100644 +index 10e5032..9ff5828 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1079,6 +1079,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1092,6 +1092,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList private void handleCommand(String s) { org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot // CraftBukkit start - whole method diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch index 2defec6..98fc806 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From cb4b2666c77a64d2d0d69fe7128cb5b79b1eebab Mon Sep 17 00:00:00 2001 +From 8aed6e213a25e12c67b9492fe0ec99b7a847d41e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index 487b5a9..b8135d0 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -1,24 +1,24 @@ -From d8d0242a43b027b308c0cc9ced929c804377f7dd Mon Sep 17 00:00:00 2001 +From 05da710b600ae5090d03f6f0ebe5ad1adfc58f5d Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 3b6a514..fcfdb65 100644 +index fa7b6c2..e122df9 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener { // CraftBukkit end if (packethandshakinginsetprotocol.b() > 47) { -- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.7"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.7" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.8"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.8" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else if (packethandshakinginsetprotocol.b() < 47) { -- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.7"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.7" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.8"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.8" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else { diff --git a/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch index 49e3730..7406f7f 100644 --- a/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,11 +1,11 @@ -From c2620e0b5e61bb275c6c6f628e66a8d495de1278 Mon Sep 17 00:00:00 2001 +From 28575eda69652a901509418b5b274bc58756bb36 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3d8d59a..3e72a01 100644 +index 746cbce..155bccf 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1019,7 +1019,7 @@ public class Chunk { @@ -18,7 +18,7 @@ index 3d8d59a..3e72a01 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 221e2f2..33c4fb0 100644 +index b959a79..b07b3db 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2088,7 +2088,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch index f1fa2fe..b136558 100644 --- a/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From 12be96359526588a261e120b2194e8e9a857e716 Mon Sep 17 00:00:00 2001 +From e67e56dcd5be50fa323dbb6c5e5111238295acaa Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories @@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories Properly close inventories when unloading and switching worlds. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3e72a01..7e56837 100644 +index 155bccf..6460ab1 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -828,6 +828,18 @@ public class Chunk { diff --git a/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch index ad0ac16..9b3f410 100644 --- a/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch @@ -1,14 +1,14 @@ -From 666400319370efe36fb4f5fb4c67e745e264b044 Mon Sep 17 00:00:00 2001 +From 416a5d8363e7e87d07ceff5d97e61f547e87cf86 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 28 Jun 2013 19:52:54 +1000 Subject: [PATCH] Disallow Interaction With Self diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 1fca956..88f469d 100644 +index 9ff5828..8d6d3c7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1214,6 +1214,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1227,6 +1227,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u()); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); Entity entity = packetplayinuseentity.a((World) worldserver); diff --git a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch index 81931e2..34c4caf 100644 --- a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch @@ -1,11 +1,11 @@ -From 7960af011f00e2278bdebb8a09d11b019f55ae35 Mon Sep 17 00:00:00 2001 +From d96b140e92e6d1b05ebbcd1fbb6fbd1a2ddb3b7e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:49 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ebdcaab..5cf3833 100644 +index 687fb4b..c14ff55 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1540,6 +1540,7 @@ public abstract class Entity implements ICommandListener { diff --git a/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch index b835b42..bdc4de8 100644 --- a/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From 8394755568aba38313dc9ded45c0e1f4b43d2d1b Mon Sep 17 00:00:00 2001 +From d828c679ff0cacc857fe380616c5e9753e3f9b32 Mon Sep 17 00:00:00 2001 From: Alex Ciuba Date: Tue, 11 Jun 2013 15:23:03 -0400 Subject: [PATCH] Prevent Ghost Players Caused by Plugins @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins Check if the player is still connected after firing event. Fixes BUKKIT-4327 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 825823d..665d58e 100644 +index 49b908d..747d708 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -548,6 +548,11 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch index 8d02c4c..75e60dd 100644 --- a/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 30a420e5ff262b3c9772272fa74a0ad8711d9000 Mon Sep 17 00:00:00 2001 +From fc446e6747d22f32433ee0fcd83002cd7b16968b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:02:59 +1000 Subject: [PATCH] Plug World Unload Memory Leak diff --git a/CraftBukkit-Patches/0036-Player-Collision-API.patch b/CraftBukkit-Patches/0036-Player-Collision-API.patch index 2c0e9db..90deae7 100644 --- a/CraftBukkit-Patches/0036-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0036-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From dc094e0fa27086aada7a225a7209484ef7dd460a Mon Sep 17 00:00:00 2001 +From 535c7a565c4c81ed880b0a5d3dbdbeb8108c29bb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API diff --git a/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch index d98074e..2c3544b 100644 --- a/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,11 +1,11 @@ -From 1d1be9d558b3803373a4904f734158a013362656 Mon Sep 17 00:00:00 2001 +From e0262af8cd97118d7f5d5cbfd4f8d3b0ca28d2e7 Mon Sep 17 00:00:00 2001 From: agentk20 Date: Sat, 3 Aug 2013 19:28:48 +1000 Subject: [PATCH] Fully Disable Snooper When Not Required diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a58ac4b..ed66d5e 100644 +index e42c0ba..05b0b52 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -655,11 +655,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch index 3ea778f..2e3518d 100644 --- a/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From c50de8cff776cd840dda89ad54781c745cdba93e Mon Sep 17 00:00:00 2001 +From 1b3a4837aebc2072d4229c6e2d34938342620063 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sat, 3 Aug 2013 19:53:48 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch index 2f6293c..284d196 100644 --- a/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch @@ -1,4 +1,4 @@ -From db11f2a5d6e0b42a20e651b4435e65cd918f330e Mon Sep 17 00:00:00 2001 +From aae347ac688cad34a2bf4684deb4b14a185fde1b Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 5 Aug 2013 20:17:20 +1000 Subject: [PATCH] Cap Minimum Player Speed diff --git a/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index 7ba86fb..94b4d1c 100644 --- a/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,11 +1,11 @@ -From b4a7cd5471a376e966c3219af2ca080129a620e4 Mon Sep 17 00:00:00 2001 +From 4a01fe5baa2c8bc6ff8b4ddabe047dde8f3231e0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 14 Sep 2013 10:16:38 +1000 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 32dd2e1..51f196a 100644 +index c93a5da..17c9f64 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -300,6 +300,10 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index 734824d..1ee25d0 100644 --- a/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From 91a59b2aec6c0edbab9254c6e0aa0aa3e7fef12c Mon Sep 17 00:00:00 2001 +From 4b13a7bb4f86b86b104d512f730b058734df7ff4 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Tue, 16 Jul 2013 22:34:50 +0200 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT diff --git a/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch index 4187693..c139c5f 100644 --- a/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From d70f892f4f0ff325d7663895cf213ae0f742f0a0 Mon Sep 17 00:00:00 2001 +From b61bd159a881d8e31de9c8d640815e720420a77c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 21 Sep 2013 12:33:09 +1000 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving diff --git a/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch index b921fd7..849c328 100644 --- a/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch @@ -1,11 +1,11 @@ -From b07858f888ce0ba99638644fecc8aea78532c0f8 Mon Sep 17 00:00:00 2001 +From c2bf94e9b17ef38629028376bce393386400fe09 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 06d4687..0b0f027 100644 +index b80801a..abd85b0 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -108,7 +108,7 @@ public class EntityItem extends Entity { diff --git a/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch index 8ebf8c3..ea00227 100644 --- a/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch @@ -1,14 +1,14 @@ -From e77ef424971b9cc45485367ec4a7a0eef3e70da0 Mon Sep 17 00:00:00 2001 +From acbb89c50b0a24da787bd49dd472f57ac885f45c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 6 Oct 2013 17:36:28 +1100 Subject: [PATCH] Don't Special Case X Move Value diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8cf0b71..0d45439 100644 +index 8d6d3c7..36f0684 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -111,6 +111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -112,6 +112,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList private float lastPitch = Float.MAX_VALUE; private float lastYaw = Float.MAX_VALUE; private boolean justTeleported = false; @@ -16,7 +16,7 @@ index 8cf0b71..0d45439 100644 public CraftPlayer getPlayer() { return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity(); -@@ -222,6 +223,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -223,6 +224,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - fire PlayerMoveEvent Player player = this.getPlayer(); @@ -35,7 +35,7 @@ index 8cf0b71..0d45439 100644 Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location. Location to = player.getLocation().clone(); // Start off the To location as the Players current location. -@@ -250,7 +263,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -251,7 +264,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.lastPitch = to.getPitch(); // Skip the first time we do this diff --git a/CraftBukkit-Patches/0045-Implement-respawn-API.patch b/CraftBukkit-Patches/0045-Implement-respawn-API.patch index 77c810a..083c90f 100644 --- a/CraftBukkit-Patches/0045-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0045-Implement-respawn-API.patch @@ -1,4 +1,4 @@ -From ace47b5797decdf1436456851d37cddbc78cda68 Mon Sep 17 00:00:00 2001 +From abebbbac98d7d10cdd59763777a847de2eb81b3b Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. diff --git a/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch index 54f999b..9eefdd9 100644 --- a/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch @@ -1,11 +1,11 @@ -From 9a00ec321402602d5ae5f59f2f640db206adae98 Mon Sep 17 00:00:00 2001 +From 2d9a2afdc3d508a398d1d274597aa22a3b8740cd Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 01c66e3..46f6374 100644 +index 3359160..3a80776 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -155,7 +155,7 @@ public class EntityArrow extends Entity implements IProjectile { diff --git a/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch index 85dad7a..94fa197 100644 --- a/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From 81d520fd1ca0268598fd90138eac3b4cd3dc4a29 Mon Sep 17 00:00:00 2001 +From f0d250f577da79657fec78fcdc267d3b4b221653 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 17:52:14 +1100 Subject: [PATCH] Fix packed ice generation diff --git a/CraftBukkit-Patches/0048-Watchdog-Thread.patch b/CraftBukkit-Patches/0048-Watchdog-Thread.patch index 2fe6c15..a6032b9 100644 --- a/CraftBukkit-Patches/0048-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0048-Watchdog-Thread.patch @@ -1,11 +1,11 @@ -From 08d0172ae952d1fcc324820b650e2d793615700a Mon Sep 17 00:00:00 2001 +From a20fe0d882e5f74abac041edf5cae8ace6d3f497 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 38c634f..8f7bb8b 100644 +index 14d2207..be30d17 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -18,7 +18,7 @@ index 38c634f..8f7bb8b 100644 thread1.setName("Server Watchdog"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ed66d5e..6cef666 100644 +index 05b0b52..98d6bce 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -565,6 +565,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch index 94a4599..93ac15b 100644 --- a/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch +++ b/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch @@ -1,4 +1,4 @@ -From d60fd451c6d5fc23094f8323735234ab64028dd7 Mon Sep 17 00:00:00 2001 +From 89eb6b05e7135406df9ca8300dd018432b763e27 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 3 Dec 2013 11:07:48 +1100 Subject: [PATCH] Clear Flower Pot on Drop diff --git a/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch index 71b023e..29f2c8c 100644 --- a/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,11 +1,11 @@ -From 41a87da3590d7d0dcdf8a0f9ca2a97e47d8a337b Mon Sep 17 00:00:00 2001 +From 4780ccafe1a89c999b2be1124c3a08edfa190041 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 2 Dec 2013 23:42:09 +0000 Subject: [PATCH] Fix some chunks not being sent to the client diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 7e56837..5208dbc 100644 +index 6460ab1..f461f50 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1061,7 +1061,15 @@ public class Chunk { diff --git a/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch index 4f90fd5..a0a35bc 100644 --- a/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From fd55dcc3befd0b3ec8d3ab3c4f1f9e0c0d76fdb3 Mon Sep 17 00:00:00 2001 +From cc4c9041be7f3626120940a3d403c5266c101f91 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 5 Dec 2013 13:55:53 +1100 Subject: [PATCH] Fix Broken Async Chat diff --git a/CraftBukkit-Patches/0052-Orebfuscator.patch b/CraftBukkit-Patches/0052-Orebfuscator.patch index 52d41f8..4054ea5 100644 --- a/CraftBukkit-Patches/0052-Orebfuscator.patch +++ b/CraftBukkit-Patches/0052-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 1f1269d671396950883aa870a3a3c147de6e4793 Mon Sep 17 00:00:00 2001 +From 994ee97c638d5ac9c57491cab3db44ffb48993cc Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -25,7 +25,7 @@ index 9e0d5ad..ce91553 100644 if (block instanceof BlockFalling) { ((BlockFalling) block).a_(this.world, blockposition); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 6f3443b..dfc18e8 100644 +index 08eca3d..85f2ab5 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -210,6 +210,7 @@ public class Explosion { @@ -79,7 +79,7 @@ index 63b90f7..10c0e34 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index f2a9809..6dcf611 100644 +index 58fd07d..33a0a09 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -197,6 +197,7 @@ public class PlayerInteractManager { @@ -91,7 +91,7 @@ index f2a9809..6dcf611 100644 public void a(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a08b401..e9211fe 100644 +index b07b3db..2c5c6b0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -497,6 +497,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch index ad2fd2b..03e8c95 100644 --- a/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From 8e9ad5ba6b0da9211d0935a35cf869e18347127f Mon Sep 17 00:00:00 2001 +From 4e418f9a238858b1c13a6290ff5b667331073cb0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:45:47 +1100 Subject: [PATCH] Optimize DataWatcher diff --git a/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch index 170db4e..2802e7c 100644 --- a/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From f028d32e2c3bdbdba4b9d8fedd470f3cfe095398 Mon Sep 17 00:00:00 2001 +From 6b1f5316e3a221a450333e195178f5e29e84381d Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:32:10 +1100 Subject: [PATCH] Fire PreLogin Events in Offline Mode diff --git a/CraftBukkit-Patches/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch index 53783ab..d2b5979 100644 --- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From c4a828abaeb82576f2b80dd4199fd03dc3697a84 Mon Sep 17 00:00:00 2001 +From 23a90b4cf1ac5f80a05667740682f33132c9942a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support Provides support for IP forwarding via BungeeCord. diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index fcfdb65..974779c 100644 +index e122df9..36af75a 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -7,6 +7,7 @@ import java.util.HashMap; diff --git a/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch index dd9069f..6071e98 100644 --- a/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From a0076cb8755ae27f36b727b9a23a2b29f33dfacb Mon Sep 17 00:00:00 2001 +From fbb22dc472ea7bfda18094d280c5b7d8ae371d98 Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression diff --git a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch index 087e4a1..dcf3a73 100644 --- a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From 81a1e441ce14ac8c364b3dffd44eb282f6c07ede Mon Sep 17 00:00:00 2001 +From efe6e588fa24862c1fcf38c0c9e696aa3f66b5f0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:58:58 +1100 Subject: [PATCH] Configurable Amount of Netty Threads @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6cef666..4cb8a1e 100644 +index 98d6bce..5c7c0d0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -59,7 +59,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch index 4033025..c4b142a 100644 --- a/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From 8aee9e77f8557e093deb7e6632ecc4dd8627a4c9 Mon Sep 17 00:00:00 2001 +From 352eba0eb3c150efd3233443ec6eb2d5deaa9d83 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 15:21:02 +1100 Subject: [PATCH] Prevent Mineshaft Saving diff --git a/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch index 7f78897..14894ba 100644 --- a/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,11 +1,11 @@ -From 3da26d7355a20ec9e1dec359433c47337cafc779 Mon Sep 17 00:00:00 2001 +From 2719f638dc995d03e1da40d1977ce0da149edfed Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:39:14 +1100 Subject: [PATCH] Log Cause of Unexpected Exceptions diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4cb8a1e..56126c4 100644 +index 5c7c0d0..f95d560 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -546,6 +546,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0060-Particle-API.patch b/CraftBukkit-Patches/0060-Particle-API.patch index 3c183f3..d4ecdb3 100644 --- a/CraftBukkit-Patches/0060-Particle-API.patch +++ b/CraftBukkit-Patches/0060-Particle-API.patch @@ -1,4 +1,4 @@ -From 8b1ca7bcaf8dc4526a3e2411424db2931880144a Mon Sep 17 00:00:00 2001 +From bf78106f695dd8d9f1c06e7af4eb466e3350220a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API diff --git a/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch index 96f2329..3763eb0 100644 --- a/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch @@ -1,11 +1,11 @@ -From 7a845c3b5215c05f955a4a69511428b35bc245ec Mon Sep 17 00:00:00 2001 +From 2e302232b2732d65787de85d660ab7c123c11b4e Mon Sep 17 00:00:00 2001 From: DerFlash Date: Tue, 9 Jul 2013 00:11:12 +0200 Subject: [PATCH] Save ticks lived to nbttag diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5cf3833..5e1e695 100644 +index c14ff55..f42707e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1191,6 +1191,7 @@ public abstract class Entity implements ICommandListener { diff --git a/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch index e639ca6..ecbadf0 100644 --- a/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch @@ -1,11 +1,11 @@ -From 99507859014f932c1d4c637c3a02008d1bd70a18 Mon Sep 17 00:00:00 2001 +From 6387a4ad1c7e96f16dc8e84eadeb9179f814c6ec Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:17:37 +1000 Subject: [PATCH] More Efficient GetCubes diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e9211fe..9867081 100644 +index 2c5c6b0..a09de8e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1104,28 +1104,56 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 5f5e2d4..cb7c291 100644 --- a/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,11 +1,11 @@ -From 4cbf1d01d020a85d822368814fae42d456c919a0 Mon Sep 17 00:00:00 2001 +From 2f777535f60f27652de59adf4ccdd7a57a201c5f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5e1e695..b930c0d 100644 +index f42707e..047d882 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -120,6 +120,7 @@ public abstract class Entity implements ICommandListener { @@ -17,7 +17,7 @@ index 5e1e695..b930c0d 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 46f696f..73cdd41 100644 +index ef3ebc4..f8aec29 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -457,6 +457,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -34,7 +34,7 @@ index 46f696f..73cdd41 100644 this.bk.a(); this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 0695fe2..1680918 100644 +index 35ed213..6004e23 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -144,6 +144,12 @@ public abstract class MobSpawnerAbstract { diff --git a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch index 3020721..bc30c09 100644 --- a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From 963b791c91cc99d28cf06b1da6b51c73e772dd25 Mon Sep 17 00:00:00 2001 +From fffa67446ecf4048eb314ed7abd8758a7287daa4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 14:07:41 +1100 Subject: [PATCH] Warn if PermGen may be insufficient @@ -32,5 +32,5 @@ index aca0d97..337aa29 100644 MinecraftServer.main(options); } catch (Throwable t) { -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch index 37ba5ef..0fb8a90 100644 --- a/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch @@ -1,4 +1,4 @@ -From d3ccf96e8655a900b518b35d9acb7dfc75142192 Mon Sep 17 00:00:00 2001 +From 9bacce598c5544cba0339a9ff3da446c4a8d4a3c Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 15:57:57 +1100 Subject: [PATCH] Disable Connected Check on setScoreboard diff --git a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch index 585f201..7212a50 100644 --- a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 90bf9dee67afa7e42e9956d5d870b572f98f2938 Mon Sep 17 00:00:00 2001 +From ab7f3c1ab5d1c13a9f0a95e347bd9be9b499af54 Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option @@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option Add late-bind config option to delay binding until loading is done. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7f7ec42..b7f2382 100644 +index be30d17..8801164 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -58,5 +58,5 @@ index a306266..4edc6af 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch index e7ac262..30b2bf5 100644 --- a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From 82425c7b387b9dde3f71c10cc3261715df2452a8 Mon Sep 17 00:00:00 2001 +From d3e32f4d2fa2684eb2942b93b4bcfb237056915b Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced @@ -89,5 +89,5 @@ index 4edc6af..a2be9df 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch index 1d6c572..9c12344 100644 --- a/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From b33e57aa91bef9b61bffc1c73575eae1e4717212 Mon Sep 17 00:00:00 2001 +From 3133f7ad7c02420bd68fbc080d70da3144d506cb Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 10 Jan 2014 15:15:50 +1100 Subject: [PATCH] Fix ItemStack Unbreakable Code diff --git a/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch index ceddda1..402fc57 100644 --- a/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,11 +1,11 @@ -From d12a162d9e7495788ece80532898447a4939cc52 Mon Sep 17 00:00:00 2001 +From d3396a903f9a160ece92f486114d6101e3896f4b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 20:56:41 +1100 Subject: [PATCH] Try and Debug Crash Reports Crashing diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 56126c4..1244fbf 100644 +index f95d560..e552226 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -741,7 +741,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch index fb96083..651e7d1 100644 --- a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 39097e7eef729fb5a6c9aa9d52b16ddb3ced4008 Mon Sep 17 00:00:00 2001 +From a67e84acd959b485012eb3a9fe5c757792e0521d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -37,7 +37,7 @@ index af77eef..975d666 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1244fbf..95b4d0f 100644 +index e552226..a4beaf8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -653,7 +653,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index cae0274..4e508fe 100644 --- a/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From 18c096c98465377a05941c51d047a678f5dfc39b Mon Sep 17 00:00:00 2001 +From cd2075b5bc30ca288ccac63f55c4f9dce31414d3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. diff --git a/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index bfcdf58..03b0944 100644 --- a/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From 86ffba1e26fe732582e39d6f47274d35685793b7 Mon Sep 17 00:00:00 2001 +From a7a8f2c276f387edd4dc0937db74731132124b99 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks @@ -34,5 +34,5 @@ index 20800ed..a684d68 100644 + } } -- -1.9.1 +2.1.4 diff --git a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch index dbdede1..1991799 100644 --- a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From 79f6602fc1e00d6a50529f986b5b4a0ff003aaf7 Mon Sep 17 00:00:00 2001 +From ec2e702a67ab0ae83a7687c64b8f63d731d63850 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 95b4d0f..58d68cd 100644 +index a4beaf8..6c39107 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -116,6 +116,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -36,7 +36,7 @@ index 95b4d0f..58d68cd 100644 try { if (this.init()) { @@ -509,38 +522,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs - this.r.setServerInfo(new ServerPing.ServerData("1.8.7", 47)); + this.r.setServerInfo(new ServerPing.ServerData("1.8.8", 47)); this.a(this.r); + // Spigot start diff --git a/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch index dccd06f..76a095a 100644 --- a/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch @@ -1,14 +1,14 @@ -From b695f1fbcb1480438be8b0bb348aa4a5720bec2c Mon Sep 17 00:00:00 2001 +From e2674c80cf48aa226b0817717c7463a3fa7e4c19 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 285fd4b..684d4fa 100644 +index 7a16569..a5feb31 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java -@@ -113,6 +113,13 @@ public class PacketStatusListener implements PacketStatusInListener { +@@ -115,6 +115,13 @@ public class PacketStatusListener implements PacketStatusInListener { } ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size()); diff --git a/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch index c8eb2cf..ab27a8f 100644 --- a/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 04a310edb26da5da81ff3986c868a4e5a2ff961f Mon Sep 17 00:00:00 2001 +From aca3a68310507f5c3a8367ee0e29aa3cc8b37231 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling diff --git a/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch index 8762324..9763650 100644 --- a/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From 08991837f7535535ebb44db2c53864bf67adceb2 Mon Sep 17 00:00:00 2001 +From 16700e313cbe55c2e244316bc3fbb0aad02268fa Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 60dc7cd..9f1c122 100644 +index b0681cf..ffdf25c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -223,7 +223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch index ab87eaa..dcb0036 100644 --- a/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From a8eaa20f4a5c1a2828882a220e5d0aa8bd7160aa Mon Sep 17 00:00:00 2001 +From 9ed0e3e2709e5cc390395e9160025629a5248cfe Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch index 90d9427..f66cc78 100644 --- a/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From e8321494f95fcddb4f3f924bc00772d08cf24e56 Mon Sep 17 00:00:00 2001 +From e7bb322d4f07f7cfa1c661df2872171e9e237c2a Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions @@ -7,7 +7,7 @@ Limit a single entity to colliding a max of configurable times per tick. This will alleviate issues where living entities are hoarded in 1x1 pens. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b930c0d..82accf4 100644 +index 047d882..7e87687 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1052,6 +1052,7 @@ public abstract class Entity implements ICommandListener { @@ -19,7 +19,7 @@ index b930c0d..82accf4 100644 if (entity.passenger != this && entity.vehicle != this) { if (!entity.noclip && !this.noclip) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9cd8e9b..0e2f64f 100644 +index 6a0b22a..8090a0c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1675,7 +1675,9 @@ public abstract class EntityLiving extends Entity { diff --git a/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 9b9a928..89c4f65 100644 --- a/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,11 +1,11 @@ -From 2d59e3c8f8c49e57ee785c1de974ceba769a7009 Mon Sep 17 00:00:00 2001 +From 20accb600aff6f6c6c5e4cc1fdb54622750db89d Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 6 Feb 2014 21:59:20 +0000 Subject: [PATCH] Fix dispensing bone meal not having the correct data value diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index 381f6b8..bd88be5 100644 +index 4c68593..82cde14 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java @@ -464,7 +464,7 @@ public class DispenserRegistry { diff --git a/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch index 3d5e205..c611694 100644 --- a/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch @@ -1,14 +1,14 @@ -From da938d9681d261da9037d85fdcada88ecdee233f Mon Sep 17 00:00:00 2001 +From 903fcf17331fc740f0c35d97df935c484e7e1dd0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3e1845c..29348eb 100644 +index 36f0684..ac79faa 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -985,9 +985,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -998,9 +998,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false); } diff --git a/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch index 9461e2d..570d412 100644 --- a/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From a387d2b20493a62b91b18f5df24873c09bea4c1c Mon Sep 17 00:00:00 2001 +From bece1f16978cceaa526991d889e53f625315efdb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console diff --git a/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch index b3ce0bb..0a3952b 100644 --- a/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From b05cf0c31d35295e9f37b3acbca443de728479b4 Mon Sep 17 00:00:00 2001 +From 673a0dcfb5c95fbe1513a8e0e71d034ab6f153aa Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch index b883e16..3073ed0 100644 --- a/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch @@ -1,14 +1,14 @@ -From 07585e5ab78f2aeb308de2e14586fbcf102c0b36 Mon Sep 17 00:00:00 2001 +From 29b45e8d2d2e962b08ccde834e59299d7d255430 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 29348eb..27be388 100644 +index ac79faa..1d9bfe4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1711,7 +1711,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1724,7 +1724,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize(); // CraftBukkit - Add invalidItems check diff --git a/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch index cb0603e..c71c2f1 100644 --- a/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From 51d6b94658db8a76b68dcc72ae0fa46b2ac880bd Mon Sep 17 00:00:00 2001 +From 2d9c0f7fa94f843db9dd9947ef045f8ba666cd72 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/CraftBukkit-Patches/0085-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 index cd552c8..aaa6b59 100644 --- a/CraftBukkit-Patches/0085-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 @@ -1,11 +1,11 @@ -From 23d9a2a95c127eeae2eed8925f40c7c374f81ddc Mon Sep 17 00:00:00 2001 +From 1f93d5088bcc2a0b71f3386c8f5a02a210c7e1e2 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2801b5c..f828b35 100644 +index f2ace9a..ec5b77a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -317,8 +317,11 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 832f44a..ce4a79f 100644 --- a/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From f0257e263dd71c77ed223564ed24569bc6f1f882 Mon Sep 17 00:00:00 2001 +From 30e4c3b9c991462e070d81c0e3fd15c7775adaac Mon Sep 17 00:00:00 2001 From: hcherndon Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. @@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 27be388..62677fe 100644 +index 1d9bfe4..952b8a2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2074,7 +2074,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2087,7 +2087,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - Add "isDisconnected" method diff --git a/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch index 10e9ca2..3a2c76c 100644 --- a/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 25f452d039fa88b161a5ff66859bd1517acf0952 Mon Sep 17 00:00:00 2001 +From 7981043f8918c3310b2f50ffeeffdd6d5e834f04 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API diff --git a/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch index ed483f8..827fa5b 100644 --- a/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 3bb29ea67ea6cc2e752763d14e452962b2cca604 Mon Sep 17 00:00:00 2001 +From f6446a8b33609ca85fe75d12dda6dcb104f15353 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/0089-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch index 68abfac..8f4557a 100644 --- a/CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 5a64bf6b0f0e421fd67c3f3d568eb85ff3402cd0 Mon Sep 17 00:00:00 2001 +From dc19069d56b0c7c345ea865d24c256710b5e4b25 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/0090-Guard-Entity-List.patch b/CraftBukkit-Patches/0090-Guard-Entity-List.patch index 7f6059b..4ccd8c5 100644 --- a/CraftBukkit-Patches/0090-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0090-Guard-Entity-List.patch @@ -1,11 +1,11 @@ -From a75a61c64252e390a6d81c8288537becee9a748f Mon Sep 17 00:00:00 2001 +From 3d2444de9d3dff2136780f07577b970a123a19cb 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b1a9125..dd0b347 100644 +index a09de8e..2788061 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -37,7 +37,32 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch index 5a4d58f..3d8e6ff 100644 --- a/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From f30bc46839bc5d173791365409c15f9eff964b73 Mon Sep 17 00:00:00 2001 +From 2184149435455c1312bcdc2e8787facc7611edff 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index dd0b347..6297c05 100644 +index 2788061..8f4a08a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1093,6 +1093,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch index a140ffe..e65deab 100644 --- a/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 117b6c8ef2d4cefe3d01a0885529fcb7812edabe Mon Sep 17 00:00:00 2001 +From b83fad21f16c150a9559b077d160e143f491c0e1 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/0093-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch index 59df2ba..3b71652 100644 --- a/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 552b329c280c0d4fe152ef8a21f621975fcb4832 Mon Sep 17 00:00:00 2001 +From d6985d4bcd68995d804d36c448da61e53740b992 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,10 +27,10 @@ index 7e87687..1c053c5 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 62677fe..66d897d 100644 +index 952b8a2..43e671f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -908,7 +908,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -921,7 +921,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.player.resetIdleTimer(); } else { PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item"); diff --git a/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch index 6ece334..9eed5a4 100644 --- a/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 09effea3cc351eff455eb60541c74b30eff06ce5 Mon Sep 17 00:00:00 2001 +From c5c5b740376619ce06e68bc4d7a86b29e55b0aeb 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/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index f1f9376..42e0669 100644 --- a/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From e355c8a6cdc2a295d65da6496be37368cece2f46 Mon Sep 17 00:00:00 2001 +From 2b6851eb13bdd6af07cd3633790cc729869f2995 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 58d68cd..08efc91 100644 +index 6c39107..a8fe417 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1013,7 +1013,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch index 17b06d5..6fd59b0 100644 --- a/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch @@ -1,11 +1,11 @@ -From 1525b02cdb30856230d5ae19165272804d40b2a9 Mon Sep 17 00:00:00 2001 +From a9079c8c147b059feb5872cc7995987aa1344f36 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/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 786c8f9..08d8714 100644 +index 8801164..6331317 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -193,7 +193,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0097-Add-Conversion-Message.patch b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch index 33b04a0..07a896a 100644 --- a/CraftBukkit-Patches/0097-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch @@ -1,11 +1,11 @@ -From 74952c419faf58af3eb995ce081f7401f8be9e79 Mon Sep 17 00:00:00 2001 +From 3b149e430a4eb04fe8a283087d0bbc1d579ccc48 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/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 08d8714..586de23 100644 +index 6331317..37b5728 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -523,6 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index f123282..c85eb0f 100644 --- a/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From 72ac162291ff2d760b2315b46dfabd86db855f93 Mon Sep 17 00:00:00 2001 +From 7e2c3ef9d20fb88cbb0ade17c08ace098aea14bf 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/0099-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch index d93590e..f090a7a 100644 --- a/CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch @@ -1,11 +1,11 @@ -From f45fdd895f2eced413cae4adf271c4983ebd8473 Mon Sep 17 00:00:00 2001 +From c321d000af00c5d2ca2bd86e863a811a7f5a0fa3 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/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 54298b4..27f1d0a 100644 +index 7959242..f26d377 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -111,6 +111,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { diff --git a/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch index 9519386..e1c6012 100644 --- a/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 9f634b85d230ef4a9d556742500fcfaffe39e07c Mon Sep 17 00:00:00 2001 +From 0e10c12254d2967b89b72797ee49c7b0902ee793 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. diff --git a/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index a7e24f4..6d0e653 100644 --- a/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,11 +1,11 @@ -From ba6978c2eaea333f2d89093c01d186703bf0dc1e Mon Sep 17 00:00:00 2001 +From c869eda4bd5c84e51f74d538913fe04c48dadb4c 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/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 78f1f57..021853e 100644 +index d263ccc..846d7ca 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -142,7 +142,7 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch index f6dfbe1..827fe13 100644 --- a/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From 74b9a459b26b07780e8d019afd9ff119142b6733 Mon Sep 17 00:00:00 2001 +From ab215e11d9bdcb66d9dfda621c7b4c9051eed1eb 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/0103-Fix-Player-Banning.patch b/CraftBukkit-Patches/0103-Fix-Player-Banning.patch index 14852b3..0e75246 100644 --- a/CraftBukkit-Patches/0103-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0103-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 359688020a0c13607febe5a647a701fa71c27aca Mon Sep 17 00:00:00 2001 +From 3428699e8933a8d7a069fa5ed044666daf3683cf 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/0104-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch index 97f48eb..8a55264 100644 --- a/CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 963b1a860fa5763f1089ab83e04f1de267cb3c06 Mon Sep 17 00:00:00 2001 +From 82d2a9902b6c5c3ca1d1149b6901a81d4ea6730f 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/0105-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch index e177d7d..3e770c9 100644 --- a/CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch @@ -1,11 +1,11 @@ -From 9e7b109a9a6c03c264f2a6aefcf00cf7cb71778a Mon Sep 17 00:00:00 2001 +From 0641dde5f043d110afd4a703ebf54f9119780735 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/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0dcf37e..686a632 100644 +index 3e9a4ef..0a39b06 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -415,7 +415,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch index 32cab69..425b407 100644 --- a/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch @@ -1,11 +1,11 @@ -From 517e5c21efe83837102eb110d9375f073c981a74 Mon Sep 17 00:00:00 2001 +From d37b3eb2a15a15d2b2fe5dc961afee91639f27f2 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/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index 14cb7f1..0606319 100644 +index 993a4a8..f131419 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -1016,6 +1016,17 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener { diff --git a/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch index b4795fa..a0d44df 100644 --- a/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 509720e9c0cbc5792b8fc8ba1e7f460eeb57133a Mon Sep 17 00:00:00 2001 +From 65e5c43140f143929765996b367096545c599b0e 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/0108-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch index dcd31c5..0ae6919 100644 --- a/CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From 0ceed1d335bb351dc9f27ca0882e993284f88949 Mon Sep 17 00:00:00 2001 +From 1874f36ea0732d6a192939fb70eb42404982c130 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/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch index 9f995f7..e27b4df 100644 --- a/CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From 339cf836d006a4de09aaae61cfada32f5fa90d5d Mon Sep 17 00:00:00 2001 +From 85765920a09d7855268c56f5c48f1e3fb62de2b8 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/0110-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch index 6d2ebf0..d8985ea 100644 --- a/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From f42c729127f72c572f9e6c963d98f1e52eeb66a6 Mon Sep 17 00:00:00 2001 +From 0204f55807902b26e73cbeacf9cc7b35e663feac 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/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 035bb63..be8144e 100644 --- a/CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,11 +1,11 @@ -From dcce3af6ec0b9997c1cb7b62a8eac55e860c3d13 Mon Sep 17 00:00:00 2001 +From dec6565d5f0dbfe64fbed7519d61f4cc0e5a2135 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6297c05..b4d6e0b 100644 +index 8f4a08a..31e5e16 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -135,6 +135,8 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch index 44efac7..b4e421d 100644 --- a/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 58c3f180077e0acae70e5144bf8a1b4324835a38 Mon Sep 17 00:00:00 2001 +From 374f5ab0db2baef88ccc9a2902217541af02eb1f 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/0113-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch index 24323fb..c67afbb 100644 --- a/CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 5d56c6de0519ca6a91ff18eb341aa3d276b07ec9 Mon Sep 17 00:00:00 2001 +From 75076bfbbe1016773c9c4d87a2ad4d8f7b50d2e4 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 @@ -12,7 +12,7 @@ initialized. The ServerConnection does not remove NetworkManagers with this flag. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 27f1d0a..8430a46 100644 +index f26d377..247973d 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -68,6 +68,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { diff --git a/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch index 010110a..09ef751 100644 --- a/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch @@ -1,11 +1,11 @@ -From b5eadd0d98e88009babf5263ebe4b344b22a685e Mon Sep 17 00:00:00 2001 +From 533edd1b196f90377cf3f6cd3285d105c0a93068 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/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 021853e..31b4e81 100644 +index 846d7ca..8001b8a 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -208,7 +208,7 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch index 53a87d8..a141d44 100644 --- a/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch @@ -1,11 +1,11 @@ -From ee05d4ad6bea5b604c4577c2f46e319078df1510 Mon Sep 17 00:00:00 2001 +From 91aac16f7fba39ca6d930f6674ada3847b535755 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/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 686a632..a88be23 100644 +index 0a39b06..9a5549d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -36,6 +36,7 @@ import org.bukkit.event.player.PlayerQuitEvent; diff --git a/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch index b4db4ab..7fce1ec 100644 --- a/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From d413ec0d01767b3a079b36776733faedf1a0d7fa Mon Sep 17 00:00:00 2001 +From 5f66321b10cf8fc0a8fe7927316dd29b64b9c05e 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/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch index 259e2f9..01810fd 100644 --- a/CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From 316ae5c2a9389cef2783b662dc9176f66c1af6ad Mon Sep 17 00:00:00 2001 +From 2e45a50a997a1761d9e654dd3e7411261552560d Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 14 May 2014 13:46:48 -0700 Subject: [PATCH] Process conversation input on the main thread. Fixes @@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 66d897d..1d437f3 100644 +index 43e671f..6e112b3 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -970,7 +970,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -983,7 +983,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } else if (s.isEmpty()) { c.warn(this.player.getName() + " tried to send an empty message"); } else if (getPlayer().isConversing()) { diff --git a/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch index e91f135..8ccbddc 100644 --- a/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,11 +1,11 @@ -From ddae5d95c6f6b3948a90dba0fcb58c1419b407c1 Mon Sep 17 00:00:00 2001 +From f8d2ebece4cbfea47c0508af16e7319fad0feeba Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 23 May 2014 18:05:10 -0400 Subject: [PATCH] Configurable save-on-stop-only for UserCache diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 08efc91..5230d6d 100644 +index a8fe417..1e6e401 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -485,7 +485,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch index ff0fdcf..6ec0465 100644 --- a/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From 6dd5472073fb56eba68a93234a29554851049350 Mon Sep 17 00:00:00 2001 +From 00516c63ec6296d6f6e5b7b5f28f8cc4923cfaf9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Jun 2014 19:40:00 +1000 Subject: [PATCH] Prevent Unbounded IntCache Growth diff --git a/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch index 4403a4d..6cabb9f 100644 --- a/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From 8a4ba154eff9e7d5c1a7f867209628a5189db97a Mon Sep 17 00:00:00 2001 +From 956e8682b2cb78cd680675829030f6e3c8cc1bf7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Jun 2014 23:42:52 +0100 Subject: [PATCH] Add damager to the unhandled error diff --git a/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch index a5a57a8..16d358e 100644 --- a/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From d8bc7dc9821978c1e96ece42247fcd9afc2f69ed Mon Sep 17 00:00:00 2001 +From c84e8b213d787358de30c456003e4abc570e9a32 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Tue, 24 Dec 2013 07:55:23 -0800 Subject: [PATCH] Cross World Entity Teleportation diff --git a/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch index 8c91238..47d318b 100644 --- a/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch @@ -1,4 +1,4 @@ -From 653dc6de7150c294c5f5404a872d2a3daf4c3e8a Mon Sep 17 00:00:00 2001 +From 2b6ef7bbe24544e2c371624f0652ca5601832eb2 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 29 Jun 2014 21:10:34 +0100 Subject: [PATCH] Limit block placement/interaction packets @@ -24,10 +24,10 @@ index c611db1..28cb5e3 100644 public void b(PacketDataSerializer packetdataserializer) throws IOException {} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 1d437f3..1e5bff1 100644 +index 6e112b3..bca1058 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -642,9 +642,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -651,9 +651,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit end } @@ -50,7 +50,7 @@ index 1d437f3..1e5bff1 100644 // CraftBukkit start if (this.player.dead) return; -@@ -668,7 +681,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -677,7 +690,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit start int itemstackAmount = itemstack.count; @@ -60,7 +60,7 @@ index 1d437f3..1e5bff1 100644 // Raytrace to look for 'rogue armswings' float f1 = this.player.pitch; float f2 = this.player.yaw; -@@ -704,6 +718,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -713,6 +727,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList if (!cancelled) { this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack); } @@ -69,7 +69,7 @@ index 1d437f3..1e5bff1 100644 // CraftBukkit - notch decrements the counter by 1 in the above method with food, // snowballs and so forth, but he does it in a place that doesn't cause the -@@ -729,7 +745,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -738,7 +754,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } if (this.checkMovement && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.getWorldBorder().a(blockposition)) { diff --git a/CraftBukkit-Patches/0123-Better-item-validation.patch b/CraftBukkit-Patches/0123-Better-item-validation.patch index c4c17bb..7ed3f95 100644 --- a/CraftBukkit-Patches/0123-Better-item-validation.patch +++ b/CraftBukkit-Patches/0123-Better-item-validation.patch @@ -1,4 +1,4 @@ -From 9f4a6bdc6acd7aea362eb840ac4293d6fe21c27d Mon Sep 17 00:00:00 2001 +From ef9a7d32e5729d89d759ce1c8e852b2665039049 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation @@ -102,7 +102,7 @@ index 0318958..0b5ada0 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 8c4f734..2429eef 100644 +index e487d52..07ea6f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -47,6 +47,10 @@ import java.util.logging.Logger; diff --git a/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch index c4b2140..c9a7264 100644 --- a/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 4a8222673596ec7fb6fa2b3332b1cb4687b3a446 Mon Sep 17 00:00:00 2001 +From ad74c9a1713fd13fe9142b4c0ea0a96f175a52b8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation diff --git a/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch index 3ba5ebd..e6c1d83 100644 --- a/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 0204f73852ced34f302253b85bceb6b81d88f6ae Mon Sep 17 00:00:00 2001 +From e58acb7c281b40d8de5690e907a1a0191ec31efd Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 09:01:50 +1000 Subject: [PATCH] Disable ResourceLeakDetector @@ -6,7 +6,7 @@ Subject: [PATCH] Disable ResourceLeakDetector Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now). diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5230d6d..2621f37 100644 +index 1e6e401..dd3c740 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -124,6 +124,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch index 9f41c2f..17af992 100644 --- a/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From 27bceaa4a4b264ed8ef1b2b6b19946dc966b8e37 Mon Sep 17 00:00:00 2001 +From 8b6407c85ad1c8bf001e9a4bb801c381e1ff2067 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add More Information to session.lock Errors diff --git a/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch index b176abf..bb1a2b8 100644 --- a/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From 831e476e4c5996de7479fe9ab5967758f42f61fa Mon Sep 17 00:00:00 2001 +From 746d08b447fa46f08a994ba4f1491f49786c01ef Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading @@ -27,7 +27,7 @@ index f5c3aae..8e4ecfd 100644 IOUtils.closeQuietly(bufferedreader); } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 72154d4..ebcc49d 100644 +index 85277a6..0f82e06 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -199,6 +199,11 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch index b0a46af..bcce149 100644 --- a/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From ee3f1329e4aa23d669a253d8ab748298e1f001f6 Mon Sep 17 00:00:00 2001 +From bf137a5718fbafd2b1c46dcb7b79f90996a1cf2a Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 20:27:52 +1000 Subject: [PATCH] Fix Slow "Loading Libraries" diff --git a/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch index b708024..fa0faa5 100644 --- a/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From dc9bf7b99878861b221c5ec7208d8fd15cf07259 Mon Sep 17 00:00:00 2001 +From 05e99ed4d627500b2b69f8d9f9ed9008f1b7b391 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Jul 2014 10:35:44 +1000 Subject: [PATCH] Add CommandLine EULA Flag @@ -8,7 +8,7 @@ This flag contains the same message as eula.txt (albeit with proper grammar for This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ad4e370..15d161d 100644 +index 37b5728..8dd4ef1 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -123,7 +123,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 5ace7b8..b81bce2 100644 --- a/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From 844afeb670e1b8cced149f5b343669bfef9ababc Mon Sep 17 00:00:00 2001 +From 639afecbc1c663a8389f2fd401d78689562657e4 Mon Sep 17 00:00:00 2001 From: drXor Date: Thu, 17 Jul 2014 21:13:15 -0400 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked diff --git a/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 287986a..95ab53a 100644 --- a/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From 9d49fee2e7d303f46d087ad0e983d1c468e895e3 Mon Sep 17 00:00:00 2001 +From 397d6c2e1211224b0fa42fa8882897b840b8108e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots diff --git a/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch index 0fafd5f..9f08c56 100644 --- a/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch @@ -1,4 +1,4 @@ -From 4ec6e6d9f75473b9bc9eb14730e745576734f75d Mon Sep 17 00:00:00 2001 +From c41b1b42f91f97dff1016df73e012f12001bb4a3 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 19:54:41 +0100 Subject: [PATCH] Prevent a crash involving attributes diff --git a/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch index 3416f1d..5e446fd 100644 --- a/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch @@ -1,14 +1,14 @@ -From f6780bc97b1cbc9978014f36a98b6b86aabfd962 Mon Sep 17 00:00:00 2001 +From 52cbaa24c5487aa00a82e16acd4e264400cf9914 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index aac4851..54bc1b0 100644 +index bca1058..44834ce 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -417,7 +417,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -418,7 +418,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList d15 = d11 * d11 + d12 * d12 + d13 * d13; boolean flag1 = false; diff --git a/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch index ff184c2..fe092e6 100644 --- a/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch @@ -1,11 +1,11 @@ -From 1c3789b83f01eb6c0d1ee5d4fd021310896a505a Mon Sep 17 00:00:00 2001 +From fb664aa6b7640d6e4a57e19531ff09db02abefc5 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b4d6e0b..d1beb67 100644 +index 31e5e16..5a4e9e7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1946,6 +1946,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch index 3a16eb4..c7b17d6 100644 --- a/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch @@ -1,14 +1,14 @@ -From bbf233abd32c15cf9fc7a04f9f2fadc4268b767c Mon Sep 17 00:00:00 2001 +From a5a3945c78dc3ef73045877c01e8854a95314ef3 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 54bc1b0..9216dee 100644 +index 44834ce..6f630b8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -390,7 +390,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -391,7 +391,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList double d14 = this.player.motX * this.player.motX + this.player.motY * this.player.motY + this.player.motZ * this.player.motZ; double d15 = d11 * d11 + d12 * d12 + d13 * d13; diff --git a/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch index a81f575..40a3083 100644 --- a/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 861f27394c887f77a7bd70a9bacc57465bbb797b Mon Sep 17 00:00:00 2001 +From 828f70cff22e47607ef0d152f4f6c46bbc71230c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Jul 2014 20:46:04 +1000 Subject: [PATCH] Apply NBTReadLimiter to more things. diff --git a/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch index 1d9f177..109a0c2 100644 --- a/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From 21246e4781f48b4bd323d98cb06b83090bd20b1d Mon Sep 17 00:00:00 2001 +From 4c2b941fe224eee039c7f65edf58b8ad77b1426a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. diff --git a/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch index 45dd70e..9d2f653 100644 --- a/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 51e9c510d10f76c98058aebb0aa2e2c408141243 Mon Sep 17 00:00:00 2001 +From 4002c6b3c19aba6c2935ef405c4c460c810fcfd6 Mon Sep 17 00:00:00 2001 From: Maxim Van de Wynckel Date: Wed, 30 Jul 2014 01:19:51 +0200 Subject: [PATCH] Only fetch an online UUID in online mode diff --git a/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch index cc90cf5..51f3c04 100644 --- a/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From a28c379683f1d90d8890fcdf7a9d4b392c7471d8 Mon Sep 17 00:00:00 2001 +From bebc5998602c0facf0282204a3f2ff4060618c25 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 31 Jul 2014 17:48:20 +0100 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go @@ -6,7 +6,7 @@ Subject: [PATCH] Filter attribute modifiers which cause the attribute to go diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 2429eef..736aa69 100644 +index 07ea6f6..2dac846 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -49,6 +49,8 @@ import org.apache.commons.codec.binary.Base64; diff --git a/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch index 544ac4e..e8b37cb 100644 --- a/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From e9bf5839e1d74f13665aaf6caef5be41f5206db0 Mon Sep 17 00:00:00 2001 +From 14ba0bac64f727b84aa4aab30e05677315b3bf9b Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak @@ -18,7 +18,7 @@ index 4b8d548..451f481 100644 public PersistentCollection(IDataManager idatamanager) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d1beb67..675d747 100644 +index 5a4e9e7..60fa9ca 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1084,6 +1084,23 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch index 614c9c4..fd5fdf4 100644 --- a/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From 9a71849acefdb6696f404aaabe4f25543958fd3f Mon Sep 17 00:00:00 2001 +From 77c78866dba86d58c6ae8ea82fdce606b7164a38 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest @@ -9,7 +9,7 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever This will now fix Trapped Chests too. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fba6814..65f13be 100644 +index 8a1165c..33d017b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -126,7 +126,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch index 0110beb..ce1d780 100644 --- a/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch @@ -1,11 +1,11 @@ -From 3b912fcf47b7e4ced2ee16895b4541171622d74e Mon Sep 17 00:00:00 2001 +From 3e731738ced0c87cd5f03fd0c54ab1edfa5613ab Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 15 Aug 2014 18:11:09 -0400 Subject: [PATCH] Remove uneeded validation diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 3940b5e..7b0e9a5 100644 +index 2dac846..e3d3424 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -239,7 +239,7 @@ class CraftMetaItem implements ItemMeta, Repairable { diff --git a/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch index 22a44b6..8de1353 100644 --- a/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch @@ -1,11 +1,11 @@ -From 6602ece5a20bf90d8b724daaeac85179849c4419 Mon Sep 17 00:00:00 2001 +From c3af668438118d457866a2340ad0776adc0f8da9 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 51f196a..7eb26f7 100644 +index 17c9f64..67a0337 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1084,7 +1084,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -30,7 +30,7 @@ index 51f196a..7eb26f7 100644 } diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index 456b9b3..3af4180 100644 +index 2505a78..d0bcad6 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -63,7 +63,7 @@ public class FoodMetaData { diff --git a/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch index 37aa4b0..b7886bc 100644 --- a/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From 50c4dc270b2f15a45658f140d5b38f5ca40bc402 Mon Sep 17 00:00:00 2001 +From c11e87b8641201bbfd08f766f27d6755241a17e5 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 17 Aug 2014 12:42:53 +0200 Subject: [PATCH] Make debug logging togglable. diff --git a/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch index 51a11a2..1fa2696 100644 --- a/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From ee04746a77b82b2b9e053135849a2700536315a8 Mon Sep 17 00:00:00 2001 +From fd3dd337c8a095fdc855e9053dfeb1b99820445f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 19 Aug 2014 11:04:21 +0100 Subject: [PATCH] Skip invalid enchants in CraftMetaItem @@ -8,7 +8,7 @@ CraftMetaItem would add a null enchantment into the enchantment map which causes NullPointers later diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 9a8820b..e57431f 100644 +index e3d3424..dcb9252 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -460,7 +460,11 @@ class CraftMetaItem implements ItemMeta, Repairable { diff --git a/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch index d0dc3cb..edc1714 100644 --- a/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From d966cfec69e14adf9c0cfb56f49bce731977ef8f Mon Sep 17 00:00:00 2001 +From 4643d3aca507105b0884925d7b0921bccd197e7f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick @@ -19,7 +19,7 @@ index 10f6e47..2d22327 100644 this.lastY = this.locY; this.lastZ = this.locZ; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 65f13be..d76b965 100644 +index 33d017b..6755143 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -595,6 +595,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 81fe401..17cc958 100644 --- a/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 31d25787ca265f644141847830548922e666faed Mon Sep 17 00:00:00 2001 +From 38a5eeda8635f6ae1ca939f83dc00d2d8dd5e9fc Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:35:16 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch index 15086e2..b4a283b 100644 --- a/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch @@ -1,11 +1,11 @@ -From 8a83720e3e9a6d45d8510de3b4648f4dac56afcd Mon Sep 17 00:00:00 2001 +From a476dbf685e3d8dde6453ff399a6a9ebd04782ae Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 13:56:51 -0400 Subject: [PATCH] Configurable Hanging Tick diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java -index 16dfb1d..e491684 100644 +index b93e317..f374c39 100644 --- a/src/main/java/net/minecraft/server/EntityHanging.java +++ b/src/main/java/net/minecraft/server/EntityHanging.java @@ -96,7 +96,7 @@ public abstract class EntityHanging extends Entity { diff --git a/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch index 7ded39a..09e3a65 100644 --- a/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From 90bd24d4d28e095139ef5331db56120c87d507e4 Mon Sep 17 00:00:00 2001 +From 90cb302d6c181c0f8751bf726b81a69030985e89 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Sep 2014 21:43:15 +1000 Subject: [PATCH] Refactor ItemDoor Place diff --git a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch index 9fc1099..dd8c9f0 100644 --- a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From d75790ba950e9943253bf4af2df1dda617b21b02 Mon Sep 17 00:00:00 2001 +From 537ef38fa3026d0dc833a003e64bd54150ca105e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 13:06:05 +1100 Subject: [PATCH] BungeeCord Chat API diff --git a/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch index be6144a..8b6f966 100644 --- a/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From c3cc0f09b0bcc0b21478def0b640d8df972bfebe Mon Sep 17 00:00:00 2001 +From 907b96bf524d11d1d93ac400cd6968ce15acaa3b Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:33:36 +1100 Subject: [PATCH] Use Standard List for EntitySlices. diff --git a/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch index 7c8b4ff..a7cbde5 100644 --- a/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 0ab46e5c885ac8f12eaf058dbcbc85c526ae416d Mon Sep 17 00:00:00 2001 +From f72e5ec9cfe8c8581e12ba456e8f43b914111775 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. @@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based This feature was commisioned by Chunkr. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 675d747..ad0ee74 100644 +index 60fa9ca..0271b19 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -137,6 +137,9 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch index bd246fd..8b3ad3c 100644 --- a/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From dabcdb18f4421128e642446c3a8ed74b73efd019 Mon Sep 17 00:00:00 2001 +From 9f870cc994c0981b84b9efa460b07a60ec9250ec Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Feb 2015 12:27:40 +1100 Subject: [PATCH] Use FastMatches for ItemStack Dirty Check diff --git a/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch index cb9edba..36cf1d3 100644 --- a/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch +++ b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch @@ -1,11 +1,11 @@ -From 2801e27256bb859f88d4ee6ee982c9f576f45639 Mon Sep 17 00:00:00 2001 +From fef3370f99356cf082547e89ddee6f6cf81e876f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 Apr 2015 09:19:39 +1000 Subject: [PATCH] Use CLQ for main thread tasks. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2621f37..bc98e1f 100644 +index dd3c740..2079772 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -100,7 +100,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0155-map-decoration-fix.patch b/CraftBukkit-Patches/0155-map-decoration-fix.patch index ab072b0..d1dfe61 100644 --- a/CraftBukkit-Patches/0155-map-decoration-fix.patch +++ b/CraftBukkit-Patches/0155-map-decoration-fix.patch @@ -1,4 +1,4 @@ -From c5d744d965a655960494d8627c0110271a3444d7 Mon Sep 17 00:00:00 2001 +From 06637cad4bcf948b5d0beb7260bbf575cb37c728 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Sun, 26 Apr 2015 02:14:13 +0300 Subject: [PATCH] map decoration fix @@ -123,5 +123,5 @@ index d56a291..ad47bdd 100644 MapIcon decoration = (MapIcon) worldMap.decorations.get(key); cursors.addCursor(decoration.getX(), decoration.getY(), (byte) (decoration.getRotation() & 15), decoration.getType()); -- -1.9.1 +2.1.4 diff --git a/CraftBukkit-Patches/0156-Use-Map-for-getPlayer-String-lookup.patch b/CraftBukkit-Patches/0156-Use-Map-for-getPlayer-String-lookup.patch index 812c904..bb216c4 100644 --- a/CraftBukkit-Patches/0156-Use-Map-for-getPlayer-String-lookup.patch +++ b/CraftBukkit-Patches/0156-Use-Map-for-getPlayer-String-lookup.patch @@ -1,11 +1,11 @@ -From 4534a446515a78783aec25149371e8292e1bb7a0 Mon Sep 17 00:00:00 2001 +From 6a4b038a8cf73929c980c8dfd83ea5fea8078a13 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 13 Jul 2015 19:05:15 +1000 Subject: [PATCH] Use Map for getPlayer(String) lookup. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index ab1d9a5..461e3f9 100644 +index 9a5549d..d3d19dd 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -65,6 +65,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch b/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch index 2dea2fe..9816efe 100644 --- a/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch +++ b/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch @@ -1,4 +1,4 @@ -From 9b4c6412b90ef97bf2d1795b3cc8cca78ce88670 Mon Sep 17 00:00:00 2001 +From 2fb83fb54e5b9c84088869399618c55019d16381 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 22 Jul 2015 19:04:37 +1000 Subject: [PATCH] Clear Packet Queue on Disconnect @@ -17,10 +17,10 @@ index 247973d..9d23c6c 100644 NetworkManager.g.warn("handleDisconnection() called twice"); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a6d8b96..2124daa 100644 +index 6f630b8..68358e9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -882,7 +882,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -895,7 +895,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start