diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 1c9c78781a..4affa52a56 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From d35eb2e7b032daa603adb2d6bded806c571f2958 Mon Sep 17 00:00:00 2001 +From 194ff8ab46d416cfbd1e1c09ae4ea53f84949ab9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch index 54ec4ef87d..2f587acef5 100644 --- a/Bukkit-Patches/0002-Spigot-Timings.patch +++ b/Bukkit-Patches/0002-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 307267c4b0b17ad241ae7ad8f8baf106a3408002 Mon Sep 17 00:00:00 2001 +From 8d138fbb2a8a9b588e673ee5855e662db585a34d 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 38661ed65e..7ab6ed5970 100644 --- a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 654acca108839b65a772cce9154c6f177249256b Mon Sep 17 00:00:00 2001 +From 4523472589759a21480748098592974ad2792e03 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 1a3c117593..2d53a82990 100644 --- a/Bukkit-Patches/0004-BungeeCord-Support.patch +++ b/Bukkit-Patches/0004-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 8f696725c1b35a064cd4fed84209f226b342b3f7 Mon Sep 17 00:00:00 2001 +From 0b286d348e11792e7da9b19a7fd02e623ed52aca 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 0829a0ce0a..ab61ab981b 100644 --- a/Bukkit-Patches/0005-Add-Arrow-API.patch +++ b/Bukkit-Patches/0005-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 52741b1442b0a31830c4fc0fed12941f4952e1ff Mon Sep 17 00:00:00 2001 +From 161c7845321df654c9e26e47f251fa6c3997f82c 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 8a24c7df5f..654deea22c 100644 --- a/Bukkit-Patches/0006-Add-Particle-API.patch +++ b/Bukkit-Patches/0006-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From b7f4ea781b3c25795d0e7634b088c70265d6d0cc Mon Sep 17 00:00:00 2001 +From 8dda3b718e25ff37aea6e807af0070d78a6d43a4 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 efc379199f..2259b90c42 100644 --- a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 04ee5f8788f7610f2486fe64de77113c126dbba1 Mon Sep 17 00:00:00 2001 +From 9d7dd9d5f9276fce1fd98a79a90d7a4b3523001e 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 4684f3460e..347f9cd8a2 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 a9eaefd368301b5c4864045a44fa1342ae68268f Mon Sep 17 00:00:00 2001 +From f4a34eb093b24d141daa07889a425b6c5d5b7c76 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 37738a03ce..4e785ea956 100644 --- a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From 079a3005be2ade43d449b78816220b755c8e2d10 Mon Sep 17 00:00:00 2001 +From 36c03b52a29710a08ab8c8a4aecdf00877847315 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 b0874cda15..9731e0aead 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 80ef0d7b1087f5fe6f649ae203c725955572e767 Mon Sep 17 00:00:00 2001 +From d42215ef49162229b53cdae06df8143f7d3b8692 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 7ca79d3096..fe25806fe2 100644 --- a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch @@ -1,4 +1,4 @@ -From 2a5b8a50c4a4f099b3c55f04fb67aa7167a0ab17 Mon Sep 17 00:00:00 2001 +From 6b81cd9d8cfc6fbc6046bd89aab7ca0b7ff83426 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 5fc715444a..6f9d800cb8 100644 --- a/Bukkit-Patches/0012-Player-Collision-API.patch +++ b/Bukkit-Patches/0012-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 44dd38e7430e311b08d019670af02ba95edd264e Mon Sep 17 00:00:00 2001 +From 8747c4a54e1c16d7e96a02212f2583f40d9d5523 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 3b86348365..bc516e734c 100644 --- a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From 038d1beb08ab34c9ca9e184dec9fdc83887bb0f0 Mon Sep 17 00:00:00 2001 +From 7aef7e6c46ff1f2c9b6b348b817b7af04f4eb327 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 c3e20db2b0..cb08665632 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 d5ab308d68818daf36befd871e7e2ace01d23479 Mon Sep 17 00:00:00 2001 +From d60f114d2e756c1757df92f70c3bf32a631f5a6d 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 1870668e3a..0294e5c880 100644 --- a/Bukkit-Patches/0015-Add-respawn-API.patch +++ b/Bukkit-Patches/0015-Add-respawn-API.patch @@ -1,4 +1,4 @@ -From 23765cfe217052f421684a8ba05260245d33b2ec Mon Sep 17 00:00:00 2001 +From e5707119e3a0e1279df92b73c9d618eb7956c7c8 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 df40f55873..3dbc191576 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 f0c7705947c6a451e14395327a4a99a8d410daf4 Mon Sep 17 00:00:00 2001 +From ae75234b451d6cf85e70ed248e758aa8d0510e72 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 717108ba61..95e573ef46 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 c29cf606489a4e59e68a6c93e17200afe054c25d Mon Sep 17 00:00:00 2001 +From 4e7e25927d68916ab42503766e264c3db44155be 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 70e5dcd168..aec26191ef 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 ab2d9521139e82f956683828c60f506fdf6a0da2 Mon Sep 17 00:00:00 2001 +From e3615f3fa41f42a38dbc675946b23311055a8938 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 82cbb93a3e..c0d85d4d17 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 c5fe30d39567423a3ad99602b7b16e9fea60de23 Mon Sep 17 00:00:00 2001 +From e166921a9aab5987a18667ff0faed088cdc870f2 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 689866c029..afe4bbab44 100644 --- a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 9a96f7e60f3b3f14e8b93ced586c7dd7382aa18d Mon Sep 17 00:00:00 2001 +From aa93d11f7bf75114678d117ff6716ac053fbfa7a 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 8c2f47c126..86a6f27c5c 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 f539a053099a090b756663ea24cb1138e398501a Mon Sep 17 00:00:00 2001 +From 695554e3a650ccdb4d3d1d1ae56fb6bfacda48ea 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 diff --git a/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch index 2a11a24c75..1009fbb3b9 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 d16c4523a2ceb4982d61f4ab9de0de7c8365e36b Mon Sep 17 00:00:00 2001 +From c273b600a1dc967bfb9584ffb910e5ac05a3feb5 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 721e692855..1f5edf3aca 100644 --- a/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch +++ b/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From d4bf4914fbad3a515eee90f86b75c1ed0c4a6897 Mon Sep 17 00:00:00 2001 +From b4f68c78aa8154ab3f3fee79fa35967382eb3aff 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 4e2844b7ff..5095363041 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 0c39657113b2d277479e3d54af0d629adb382b64 Mon Sep 17 00:00:00 2001 +From 3023d912fbd278e9cce35e715477f5a1969e1441 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 05f2395942..9bfaf5c3c3 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 f0d5641078f99b04e23d73e262a8c333a738ec35 Mon Sep 17 00:00:00 2001 +From a7b3e4ecddc7a8203270b844a902a2d0a892cf25 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 79ccd23de0..fb5aa843cc 100644 --- a/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch +++ b/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch @@ -1,4 +1,4 @@ -From 00c7ee3cabfe5725c8a1b466cca6cdf7a6e61f01 Mon Sep 17 00:00:00 2001 +From cd9f774fd319b7bc548a18585c2ac16cbc61076a 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/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 5e7b6b8d44..d02bb2d031 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 f36cbb4943bd6515cb4b1192c6243223a3d3290f Mon Sep 17 00:00:00 2001 +From cead8b988efa720dedbe6a3b314552416780234d 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 7ce1083b03..494c26aee1 100644 --- a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch @@ -1,11 +1,11 @@ -From d67111c349697a604e4f0d42987c1f2cf6f54d2c Mon Sep 17 00:00:00 2001 +From 5e62f68946e40092b2fddd799acc3aba09caf23c 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 0a4aa07..bad3e43 100644 +index 6377570..4f87919 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 bcfe6c3089..b7e80017cf 100644 --- a/Bukkit-Patches/0029-Add-restart-API.patch +++ b/Bukkit-Patches/0029-Add-restart-API.patch @@ -1,4 +1,4 @@ -From aec4742c4696be1fb949189ddd4c02fd20bdaa00 Mon Sep 17 00:00:00 2001 +From 785014588a688d3453f23d230ef33662d51e3556 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 74548f44ee..61518b37bf 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 557701997ce405356a4c971de0a32a8587511244 Mon Sep 17 00:00:00 2001 +From 87d690ad5537531bc6eb1ac0d96dd4c21d6f64c9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index 0441f7b22d..82c1b67396 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 13ab33d4e7852bc53e1c51bac7a312b25e041503 Mon Sep 17 00:00:00 2001 +From e13667d0360393598b38b158b13e1d1018d7bd68 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/0003-mc-dev-imports.patch b/CraftBukkit-Patches/0003-mc-dev-imports.patch index b0cc8470da..399251ceb3 100644 --- a/CraftBukkit-Patches/0003-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0003-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From 8e5e19fbbd923c11ef5ac57bfb402a1237bd614a Mon Sep 17 00:00:00 2001 +From fd78b8e2113ce1142bade02177cd0faa07b34ae7 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/0004-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch index 796349aa0b..65c29aec74 100644 --- a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch +++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch @@ -1,4 +1,4 @@ -From 81c785f55dd68fa4b55c1626e3a2ab08e3776f7f Mon Sep 17 00:00:00 2001 +From e65f697fae5a24e96c2eb6d5e5e73e0256425022 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 bf1678d..f965592 100644 +index 449d336..f8274ee 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1263,6 +1263,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 ad5d6e34e0..343b1bfe62 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 92394ce4c8727ef50ae51c9090a6c8cdaaa29d73 Mon Sep 17 00:00:00 2001 +From 990c91d3496dc24aca7e201b7bb46c7fce3f0279 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 c0aff53..53b5e87 100644 +index 6d80991..9a38cca 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -165,6 +165,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -35,7 +35,7 @@ index c0aff53..53b5e87 100644 if (!this.getOnlineMode()) { DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bb8fd66..bdedeee 100644 +index f5b497c..fa104d1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -97,6 +97,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch index fc745eceaf..025a53be9b 100644 --- a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From 0f544805062834e55ff56f0cde813c693dbcc85d Mon Sep 17 00:00:00 2001 +From 876a2fbc11025b6010feb8734606f77f00067506 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates diff --git a/CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch index 5c23a615a5..edc5e7850e 100644 --- a/CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From ce110c7a6c2873311e74cc6391cdf8ebe7022b52 Mon Sep 17 00:00:00 2001 +From 53735167b867b6452097a69ee6633b6202e3d2b5 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 @@ -43,10 +43,10 @@ index 6009cac..7ea1150 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bdedeee..a7c1afe 100644 +index fa104d1..05175e1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -898,6 +898,23 @@ public abstract class World implements IBlockAccess { +@@ -901,6 +901,23 @@ public abstract class World implements IBlockAccess { // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead event = CraftEventFactory.callProjectileLaunchEvent(entity); } diff --git a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch index e667452aec..f3405ae58d 100644 --- a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From dc01590bc8e5a48fa1bb790e2570e9a27c748ee0 Mon Sep 17 00:00:00 2001 +From 31fcd4d94fe479ee05cb705dc715d59a94ae2dba Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -26,7 +26,7 @@ index 12589d6..1d2f580 100644 public int a(Random random) { return 1; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f832dc7..d5bfef5 100644 +index 33bbcbe..0b851a9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -618,6 +618,7 @@ public abstract class EntityLiving extends Entity { @@ -78,10 +78,10 @@ index 8b38bd2..f8570a8 100644 this.trackedPlayers.remove(entityplayer); this.tracker.c(entityplayer); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a7c1afe..010374f 100644 +index 05175e1..c5c7503 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -868,6 +868,7 @@ public abstract class World implements IBlockAccess { +@@ -871,6 +871,7 @@ public abstract class World implements IBlockAccess { } public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason @@ -89,7 +89,7 @@ index a7c1afe..010374f 100644 if (entity == null) return false; // CraftBukkit end int i = MathHelper.floor(entity.locX / 16.0D); -@@ -974,6 +975,7 @@ public abstract class World implements IBlockAccess { +@@ -977,6 +978,7 @@ public abstract class World implements IBlockAccess { } public void removeEntity(Entity entity) { @@ -97,7 +97,7 @@ index a7c1afe..010374f 100644 entity.b(false); entity.die(); if (entity instanceof EntityHuman) { -@@ -2417,6 +2419,7 @@ public abstract class World implements IBlockAccess { +@@ -2420,6 +2422,7 @@ public abstract class World implements IBlockAccess { } public void a(Collection collection) { diff --git a/CraftBukkit-Patches/0009-View-Distance.patch b/CraftBukkit-Patches/0009-View-Distance.patch index 1c41ed7dd6..23ac74d92b 100644 --- a/CraftBukkit-Patches/0009-View-Distance.patch +++ b/CraftBukkit-Patches/0009-View-Distance.patch @@ -1,4 +1,4 @@ -From 64c0667e827ec6dc583a7b346be5601838c4dd51 Mon Sep 17 00:00:00 2001 +From 76af8264cfaab9954e9733d2822a35a9ab28817b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index f8f2d14048..bd6577042a 100644 --- a/CraftBukkit-Patches/0010-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From b0bfccd96c4591deba5aa0f8a356cd2ee69f2775 Mon Sep 17 00:00:00 2001 +From 4a83498a6be54b7697c43eba373d11b5aedde899 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -46,7 +46,7 @@ index 38b9d16..8f3cd56 100644 return chunk; diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index c8a89ed..c1b1e1a 100644 +index 003aee0..53b5296 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -44,7 +44,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -96,7 +96,7 @@ index c8a89ed..c1b1e1a 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 53b5e87..92dd207 100644 +index 9a38cca..1361b06 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -22,6 +22,7 @@ import java.io.PrintStream; @@ -160,7 +160,7 @@ index 4f0098f..63cc105 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 218dc63..3ca9a07 100644 +index 0b851a9..dc91f0a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; @@ -230,7 +230,7 @@ index 218dc63..3ca9a07 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f965592..9061ff2 100644 +index f8274ee..7985cb2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -45,6 +45,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -355,7 +355,7 @@ index f965592..9061ff2 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 d39d2fe..212c576 100644 +index ab6b36f..a125127 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1234,6 +1234,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -407,7 +407,7 @@ index baf1d73..8bbdc11 100644 private static Map> f = Maps.newHashMap(); private static Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 010374f..b2305d9 100644 +index c5c7503..11e8de4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,6 +18,7 @@ import com.google.common.collect.Maps; @@ -427,15 +427,15 @@ index 010374f..b2305d9 100644 public CraftWorld getWorld() { return this.world; } -@@ -131,6 +134,7 @@ public abstract class World implements IBlockAccess { - this.isClientSide = flag; - this.N = worldprovider.getWorldBorder(); - this.getServer().addWorld(this.world); // CraftBukkit +@@ -134,6 +137,7 @@ public abstract class World implements IBlockAccess { + this.N.world = (WorldServer) this; + this.getServer().addWorld(this.world); + // CraftBukkit end + timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings } public World b() { -@@ -1303,6 +1307,7 @@ public abstract class World implements IBlockAccess { +@@ -1306,6 +1310,7 @@ public abstract class World implements IBlockAccess { CrashReportSystemDetails crashreportsystemdetails1; CrashReport crashreport1; @@ -443,7 +443,7 @@ index 010374f..b2305d9 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1320,7 +1325,9 @@ public abstract class World implements IBlockAccess { +@@ -1323,7 +1328,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.a("tick"); if (!entity.dead && !(entity instanceof EntityPlayer)) { try { @@ -453,7 +453,7 @@ index 010374f..b2305d9 100644 } catch (Throwable throwable1) { crashreport1 = CrashReport.a(throwable1, "Ticking entity"); crashreportsystemdetails1 = crashreport1.a("Entity being ticked"); -@@ -1346,6 +1353,7 @@ public abstract class World implements IBlockAccess { +@@ -1349,6 +1356,7 @@ public abstract class World implements IBlockAccess { this.methodProfiler.b(); } @@ -461,7 +461,7 @@ index 010374f..b2305d9 100644 this.methodProfiler.c("blockEntities"); this.M = true; // CraftBukkit start - From below, clean up tile entities before ticking them -@@ -1366,6 +1374,7 @@ public abstract class World implements IBlockAccess { +@@ -1369,6 +1377,7 @@ public abstract class World implements IBlockAccess { if (this.isLoaded(blockposition) && this.N.a(blockposition)) { try { this.methodProfiler.a(tileentity.getClass().getSimpleName()); @@ -469,7 +469,7 @@ index 010374f..b2305d9 100644 ((ITickable) tileentity).c(); this.methodProfiler.b(); } catch (Throwable throwable2) { -@@ -1374,6 +1383,11 @@ public abstract class World implements IBlockAccess { +@@ -1377,6 +1386,11 @@ public abstract class World implements IBlockAccess { tileentity.a(crashreportsystemdetails1); throw new ReportedException(crashreport1); } @@ -481,7 +481,7 @@ index 010374f..b2305d9 100644 } } -@@ -1386,6 +1400,8 @@ public abstract class World implements IBlockAccess { +@@ -1389,6 +1403,8 @@ public abstract class World implements IBlockAccess { } } @@ -490,7 +490,7 @@ index 010374f..b2305d9 100644 this.M = false; /* CraftBukkit start - Moved up if (!this.tileEntityListUnload.isEmpty()) { -@@ -1420,6 +1436,7 @@ public abstract class World implements IBlockAccess { +@@ -1423,6 +1439,7 @@ public abstract class World implements IBlockAccess { this.b.clear(); } @@ -498,7 +498,7 @@ index 010374f..b2305d9 100644 this.methodProfiler.b(); this.methodProfiler.b(); } -@@ -1463,6 +1480,7 @@ public abstract class World implements IBlockAccess { +@@ -1466,6 +1483,7 @@ public abstract class World implements IBlockAccess { // CraftBukkit start - Use neighbor cache instead of looking up Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4); if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) { @@ -506,7 +506,7 @@ index 010374f..b2305d9 100644 // CraftBukkit end entity.M = entity.locX; entity.N = entity.locY; -@@ -1530,6 +1548,7 @@ public abstract class World implements IBlockAccess { +@@ -1533,6 +1551,7 @@ public abstract class World implements IBlockAccess { } } diff --git a/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch index 03e3f9dd22..9f98d296b5 100644 --- a/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From df5eaaafd25ed43b37cbc8073538fa9a362616e6 Mon Sep 17 00:00:00 2001 +From dce78d1261c864f14894a4ec275a67524266a299 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 diff --git a/CraftBukkit-Patches/0012-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0012-Handle-Null-Tile-Entities.patch index 6017858396..942513f5df 100644 --- a/CraftBukkit-Patches/0012-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0012-Handle-Null-Tile-Entities.patch @@ -1,14 +1,14 @@ -From c3f267cdf3016e997fe73dff2eeb4434dd8486ad Mon Sep 17 00:00:00 2001 +From 9976921598c758d4086bb6e29eaea4070c51e3c8 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 b2305d9..ee249b6 100644 +index 11e8de4..718ad04 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1367,6 +1367,13 @@ public abstract class World implements IBlockAccess { +@@ -1370,6 +1370,13 @@ public abstract class World implements IBlockAccess { while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); diff --git a/CraftBukkit-Patches/0013-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0013-Item-Despawn-Rate.patch index 8ca2320069..9ac3cb66d2 100644 --- a/CraftBukkit-Patches/0013-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0013-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 9d325174af031a978b6485c0cd5d980cc12cfdb9 Mon Sep 17 00:00:00 2001 +From b991c9bc542ce11cc8d07f7b2c6f9ab2152cc12e 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/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index 23e715c3e4..d955b73614 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From c71914cc83d2736d7ea1c2d8a44b5e93653f3f92 Mon Sep 17 00:00:00 2001 +From e0a355fa36a67765444ee9fd9136ae31382e615c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -168,7 +168,7 @@ index eb0f8eb..39af5d5 100644 // Spigot start double radius = world.spigotConfig.itemMerge; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e5704fd..1ed0400 100644 +index dc91f0a..36ef280 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -102,6 +102,13 @@ public abstract class EntityLiving extends Entity { @@ -186,10 +186,10 @@ index e5704fd..1ed0400 100644 public void Q() { 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 ee249b6..2eaa1cb 100644 +index 718ad04..a6bd744 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1307,6 +1307,7 @@ public abstract class World implements IBlockAccess { +@@ -1310,6 +1310,7 @@ public abstract class World implements IBlockAccess { CrashReportSystemDetails crashreportsystemdetails1; CrashReport crashreport1; @@ -197,7 +197,7 @@ index ee249b6..2eaa1cb 100644 timings.entityTick.startTiming(); // Spigot // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { -@@ -1484,9 +1485,11 @@ public abstract class World implements IBlockAccess { +@@ -1487,9 +1488,11 @@ public abstract class World implements IBlockAccess { int j = MathHelper.floor(entity.locZ); byte b0 = 32; diff --git a/CraftBukkit-Patches/0015-Metrics.patch b/CraftBukkit-Patches/0015-Metrics.patch index 1755b08f35..2b5c6567bf 100644 --- a/CraftBukkit-Patches/0015-Metrics.patch +++ b/CraftBukkit-Patches/0015-Metrics.patch @@ -1,4 +1,4 @@ -From 4b8c1087a9000829b757e6d26a03637efe538dd1 Mon Sep 17 00:00:00 2001 +From 00a824f87f74ff3b2f2e1689d79dc143c481d0b5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics diff --git a/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch index 3f7b11174c..60698294e3 100644 --- a/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 1083cb33e05d7bcf0b099fd46c68f1c361093bd1 Mon Sep 17 00:00:00 2001 +From d90095ba6ee7be68fed4895caf529de47525b900 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 1fe13c94bc..e5ac59e92d 100644 --- a/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From e8ad8786c6328c9a01462f0dd6c3c1b03473bfd1 Mon Sep 17 00:00:00 2001 +From 8ab16d84c2c2527ca6d12c3f2ecee24d46e9facb 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 011d312f71..bcf82f8afe 100644 --- a/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 4cf6a4c069827b34e5d1ee8007baa6c62848352c Mon Sep 17 00:00:00 2001 +From f7020dc8e3f83b179a9ae3e8df654c1498dafc06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch index af61fd0320..9143348809 100644 --- a/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From 8ff8b8fec0b8f1f483ba928a405ed0946ef4a6a3 Mon Sep 17 00:00:00 2001 +From c80bcc2152798c930886951e4a7dadec80af2623 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 18f729998f..dbc3aaa9de 100644 --- a/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 5f99873d4186a6be4ce9bbf25c86328c2135edb7 Mon Sep 17 00:00:00 2001 +From 1fdbeff9746f4351c28d219906ba0827c4e042c3 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 c1616f41c2..490e898349 100644 --- a/CraftBukkit-Patches/0021-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0021-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From 8a37308b1c8dd725d5662048b005bc6f1b163a37 Mon Sep 17 00:00:00 2001 +From 4f8eb5a098a2303e0aa999424b5a425d6e20640a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option diff --git a/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch index 46ac87865f..0220c95788 100644 --- a/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From 25813993ae1e7b40a6b58c7fde1ce61cb71e9108 Mon Sep 17 00:00:00 2001 +From 2eb971b8ea7c38519d0acaa6dbae6e74bf2cb457 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 a502121351..8082a5c669 100644 --- a/CraftBukkit-Patches/0023-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0023-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From 9b4f5137f204ffb2f3eeeeca0787ae133fdc8257 Mon Sep 17 00:00:00 2001 +From d468b6a997fe3765682774a037d9fe7208e77647 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 505d7196d8..6aa09ea4fc 100644 --- a/CraftBukkit-Patches/0024-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0024-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From 68ce95ca445ea5500f1ef9e7ab0cfdf910b51e2d Mon Sep 17 00:00:00 2001 +From 6b0ebbee8cf70d21d0eb858d3fb1728ac1ae46f4 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-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0025-Firework-Meta-Crash-Fix.patch index ac18d70d8e..594b761b2e 100644 --- a/CraftBukkit-Patches/0025-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0025-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From d5fcc142f5bdb75438c67490e1293e89cb2194ab Mon Sep 17 00:00:00 2001 +From 12c21abb5f5c7728ff6312b73ca738cf2910085a 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/0026-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch index f1fa0af35a..3de076fef2 100644 --- a/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch @@ -1,11 +1,11 @@ -From fd54e0852c6b1ce70392ce2596a2f93c493c9349 Mon Sep 17 00:00:00 2001 +From e8472d0d5873dad6c8bf1e32c5c30962523bdf28 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 212c576..c13a2be 100644 +index a125127..785372f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1236,6 +1236,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-TabComplete.patch index ff3fd3a9ce..fddf482e99 100644 --- a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From 1ecd0d2095dc90232d8d4ece718453ed83ea336e Mon Sep 17 00:00:00 2001 +From b4675b950f4c405e96367011a77fb16fda3cd5aa 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/0028-Configurable-Messages.patch b/CraftBukkit-Patches/0028-Configurable-Messages.patch index eeb32072ec..c2eb945071 100644 --- a/CraftBukkit-Patches/0028-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0028-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From 9eef4f3b94672d8e232be0ff3474a93514dd5faf Mon Sep 17 00:00:00 2001 +From 0988b9fd0a9e454f00ff512887f0030433d98cc9 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/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch index f514dd38a3..e710d9e2a7 100644 --- a/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From 9d14fa9c9d1a1748c38afef3f9350807b4373e66 Mon Sep 17 00:00:00 2001 +From f61f7fe44fc668187ee973cff84b74ed8d0b7e99 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/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch index 9ec9af9d7f..609e9a259b 100644 --- a/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From 846fc496d915908dcc67a043e0261ade0b4f82ff Mon Sep 17 00:00:00 2001 +From 2dd0071691dbc596290019977fa9665463e7870b Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories diff --git a/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch index 7c2f18136c..5ed1a79c1e 100644 --- a/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch @@ -1,11 +1,11 @@ -From 7f19d7e7e7ded0f3a6287ce0587e62ad5bfeb544 Mon Sep 17 00:00:00 2001 +From 7cbd31d918c0c0fe968f41c1bde0c971694f7ac6 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 c13a2be..f785d9f 100644 +index 785372f..57d74b1 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1397,6 +1397,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0032-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0032-Entity-Mount-and-Dismount-Events.patch index 070487035c..67a3db899d 100644 --- a/CraftBukkit-Patches/0032-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0032-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From dff771cb23a66e9f7681e33108bcc7c7be1e9be9 Mon Sep 17 00:00:00 2001 +From cf164be65d7c2d5d3a0456d6d78e87375a0ab6e1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 27 Feb 2016 10:07:58 +1100 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/CraftBukkit-Patches/0033-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0033-Prevent-Ghost-Players-Caused-by-Plugins.patch index f9654f0c71..3708d25462 100644 --- a/CraftBukkit-Patches/0033-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0033-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From 9c1352075b542d480fa211a8f80e3a3f4fbebf40 Mon Sep 17 00:00:00 2001 +From c35aebc816912e1af6268b831a0ee61a07a3339f 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 diff --git a/CraftBukkit-Patches/0034-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0034-Plug-World-Unload-Memory-Leak.patch index 5688f421db..7e52231029 100644 --- a/CraftBukkit-Patches/0034-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0034-Plug-World-Unload-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 5d3bb1f3aa738f787b50eeca611e901225094f43 Mon Sep 17 00:00:00 2001 +From 63ae188a51ad00dc2f9530ae65fa062e1332271e 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/0035-Player-Collision-API.patch b/CraftBukkit-Patches/0035-Player-Collision-API.patch index 83ceea2c03..357df25420 100644 --- a/CraftBukkit-Patches/0035-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0035-Player-Collision-API.patch @@ -1,11 +1,11 @@ -From 5b1adb577f1517f238a6330131d4b7153db07132 Mon Sep 17 00:00:00 2001 +From d3abf8e422cced1d74772b9b14e361d65dc2a0f8 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 95bf165..b7355b0 100644 +index ce50925..7738af4 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -376,6 +376,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -25,7 +25,7 @@ index 95bf165..b7355b0 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index aba9047..b78b273 100644 +index 36ef280..c2f5ee1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1966,7 +1966,7 @@ public abstract class EntityLiving extends Entity { diff --git a/CraftBukkit-Patches/0036-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0036-Fully-Disable-Snooper-When-Not-Required.patch index 858c9d46b3..c897465e1a 100644 --- a/CraftBukkit-Patches/0036-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0036-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,11 +1,11 @@ -From accd1742de8b965b819198e95f1edf8599be21b1 Mon Sep 17 00:00:00 2001 +From b479a3f64dc5ddc7b1bed9a442747649f98c97cb 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 9061ff2..ea7e0bd 100644 +index 7985cb2..2dbe78a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -657,11 +657,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch index 01e7470635..c68c56f215 100644 --- a/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 01364dbf67a69279c652d89160b45a96b7bb1470 Mon Sep 17 00:00:00 2001 +From 772a09dbea94136c4be681a8afc7dfba35965906 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/0038-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0038-Cap-Minimum-Player-Speed.patch index 7d3355494f..6bc0c9f399 100644 --- a/CraftBukkit-Patches/0038-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0038-Cap-Minimum-Player-Speed.patch @@ -1,4 +1,4 @@ -From be15a2a5088b43317c26933b1645cdbd40ae76eb Mon Sep 17 00:00:00 2001 +From 248808468f949313874e7bcbb268e89ee3ea5bc7 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/0039-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0039-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index 75a06756d1..9b8394bc01 100644 --- a/CraftBukkit-Patches/0039-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0039-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From 56a850636f2d5ea0d5bb4632a26e662d119be4b7 Mon Sep 17 00:00:00 2001 +From c345c700f58a271f1638e3a683c8c28c287be1f4 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/0040-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0040-Allow-Disabling-of-1.6.3-Structure-Saving.patch index 0360e1d4db..5fe115dc22 100644 --- a/CraftBukkit-Patches/0040-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0040-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From 82fbb6298f22d11a2ed1c53d3f47c21f7e7e3e78 Mon Sep 17 00:00:00 2001 +From 338d1a0473ae949f6236f6eee08a016391f8d976 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/0041-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch index 789ac956f7..f13df6ae8d 100644 --- a/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch @@ -1,11 +1,11 @@ -From f5f87701e5a6ab0f80580fb892c7f5c52ee40e06 Mon Sep 17 00:00:00 2001 +From 43b248af5680128ce1b8cdaf1afb938a41a14b92 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 f785d9f..83a4551 100644 +index 57d74b1..e2b215c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -124,6 +124,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0042-Implement-respawn-API.patch b/CraftBukkit-Patches/0042-Implement-respawn-API.patch index 929d4edd13..4a96e720f4 100644 --- a/CraftBukkit-Patches/0042-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0042-Implement-respawn-API.patch @@ -1,4 +1,4 @@ -From a823d20f36d8f9b643f84546223db8a75205b5ef Mon Sep 17 00:00:00 2001 +From b1f94449576d07debe8a8f9ff1c665328b259b57 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/0043-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0043-Arrow-Despawn-Rate.patch index ee0807047e..3fb532d4ff 100644 --- a/CraftBukkit-Patches/0043-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0043-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From f52d6627b4e07c0c661637dc166311f3db6432e1 Mon Sep 17 00:00:00 2001 +From a812d6abf9d591b6f9681f6e31af6bd8e176bafb 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/CraftBukkit-Patches/0044-Watchdog-Thread.patch b/CraftBukkit-Patches/0044-Watchdog-Thread.patch index 4c3ee6a547..be9cebd4e4 100644 --- a/CraftBukkit-Patches/0044-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0044-Watchdog-Thread.patch @@ -1,11 +1,11 @@ -From fc6573b98957b800678afa46130eac7c5493fab4 Mon Sep 17 00:00:00 2001 +From 888da7cb034e6c7a729d720b21e122b9932fea27 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 92dd207..93ace97 100644 +index 1361b06..e5c0ed9 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -276,7 +276,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -18,7 +18,7 @@ index 92dd207..93ace97 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 ea7e0bd..04c36fe 100644 +index 2dbe78a..4d86a4b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -563,6 +563,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch index aea7c97a6f..a8a5baad33 100644 --- a/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,4 +1,4 @@ -From 12d2f54389e8f6303e5e98cc11d08701efc9a2bc Mon Sep 17 00:00:00 2001 +From a192d0fe60f91c9924690fc9a9566390b91c591c 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/CraftBukkit-Patches/0046-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0046-Fix-Broken-Async-Chat.patch index 6e032b89a8..e83d590d9e 100644 --- a/CraftBukkit-Patches/0046-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0046-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From 88078807067fbb7644b68ed4cba439069f8eba0d Mon Sep 17 00:00:00 2001 +From ae1236a4a4a148d9eb2e7be52b04eeef85ee54fc 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/0047-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0047-Fire-PreLogin-Events-in-Offline-Mode.patch index a751571342..2cd652377d 100644 --- a/CraftBukkit-Patches/0047-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0047-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From b2e96c15b5a2e7d0230b712608d26d883ad2a850 Mon Sep 17 00:00:00 2001 +From 375f19d5b86d8c2498918195a67c992259ffa5f6 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/0048-BungeeCord-Support.patch b/CraftBukkit-Patches/0048-BungeeCord-Support.patch index 98545fe569..d6a5c89dd7 100644 --- a/CraftBukkit-Patches/0048-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0048-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From cbc5ee4521288a2da2b9aeae62759f7e324f9652 Mon Sep 17 00:00:00 2001 +From b43b46d1e7cdf0bff17e50a7e00f9f93faf9ee33 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 8ee721e..4fd9995 100644 +index ee987b9..ed20034 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/0049-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0049-Allow-Disabling-Zombie-Villager-Aggression.patch index c18888bab9..e7387ef210 100644 --- a/CraftBukkit-Patches/0049-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0049-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 71376d91cdd5045cccb79238998187f706a4a5e1 Mon Sep 17 00:00:00 2001 +From 06d44f0f810440e2070437a393ac31f36df863d9 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/0050-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0050-Configurable-Amount-of-Netty-Threads.patch index 4bc3a4666f..a2187930a3 100644 --- a/CraftBukkit-Patches/0050-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0050-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From 37d742e73b2e9e710633315d64fdae33abd658e6 Mon Sep 17 00:00:00 2001 +From 3966c642ae368fedf29af097481312ea9e6e2d8b 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 04c36fe..8602ac6 100644 +index 4d86a4b..96d1362 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -57,7 +57,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0051-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0051-Prevent-Mineshaft-Saving.patch index 045b7ba602..8aff048f44 100644 --- a/CraftBukkit-Patches/0051-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0051-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From d1c933de9b89ebda7e58a6c6d717f8af7ef8cd0c Mon Sep 17 00:00:00 2001 +From 27435da7261f44e7b09a250d0f30068eb7d7ea37 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/0052-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0052-Log-Cause-of-Unexpected-Exceptions.patch index 66c1de565d..2c384765a1 100644 --- a/CraftBukkit-Patches/0052-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0052-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,11 +1,11 @@ -From 2a2925c6b015c6423b77e307fde7646c5d3012c0 Mon Sep 17 00:00:00 2001 +From f39cb0bae58065bf899255384f87cfbe6a512f7a 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 8602ac6..0aab39b 100644 +index 96d1362..c82c67b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -544,6 +544,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0053-Particle-API.patch b/CraftBukkit-Patches/0053-Particle-API.patch index 33ac560242..7be13b0766 100644 --- a/CraftBukkit-Patches/0053-Particle-API.patch +++ b/CraftBukkit-Patches/0053-Particle-API.patch @@ -1,4 +1,4 @@ -From d2d688e7e76a2711493cef900b44f251875f6692 Mon Sep 17 00:00:00 2001 +From 99daf1566a45a6d3e3e9e8122eec9d6cc17a0057 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/0054-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0054-Save-ticks-lived-to-nbttag.patch index e5fe68ded8..bcd0025fe0 100644 --- a/CraftBukkit-Patches/0054-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0054-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From f788b71da021723020948f5fc4bf3f4607f16570 Mon Sep 17 00:00:00 2001 +From 3226bf418d193d5aaa5075792cba7291f0d00350 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/CraftBukkit-Patches/0055-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0055-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index b0c635b945..ab53e09bd2 100644 --- a/CraftBukkit-Patches/0055-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0055-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From f5654f47ab5ba129f0337f5e00bc5f5e46beeb29 Mon Sep 17 00:00:00 2001 +From c7cfdc300957ebda374251b5487800eba6d437b6 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/CraftBukkit-Patches/0056-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0056-Warn-if-PermGen-may-be-insufficient.patch index a48507b47c..de8386c1eb 100644 --- a/CraftBukkit-Patches/0056-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0056-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From fdb8e3f808c10f65cb25429e7885b742becc6582 Mon Sep 17 00:00:00 2001 +From d4f504fab98a9308994aabf88621723d5fdc6651 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 diff --git a/CraftBukkit-Patches/0057-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0057-Disable-Connected-Check-on-setScoreboard.patch index ad347fe2dd..ddd6d02498 100644 --- a/CraftBukkit-Patches/0057-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0057-Disable-Connected-Check-on-setScoreboard.patch @@ -1,4 +1,4 @@ -From 92ea11e122a121b244220db0d91cbfbfac386e20 Mon Sep 17 00:00:00 2001 +From 2dfb8b1defba6566e19ab064918bb1b9316e69e6 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/0058-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0058-Add-Late-Bind-Option.patch index 3a79a43143..cf07a53e5e 100644 --- a/CraftBukkit-Patches/0058-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0058-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 07a28ec70f33b9e7b16d76f412bf06d060c8f191 Mon Sep 17 00:00:00 2001 +From 7aeea7d6a4332b15cc56691df077db4d28303407 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 93ace97..852f8b4 100644 +index e5c0ed9..d6a01a9 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -176,6 +176,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0059-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0059-Allow-statistics-to-be-disabled-forced.patch index 097e66141e..c9070e151e 100644 --- a/CraftBukkit-Patches/0059-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0059-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From c15db6fb5a3859e3b1423257eb673310e2a6e7a3 Mon Sep 17 00:00:00 2001 +From 20ba002dde049a8fad1402b4e976e38304e4018e 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 diff --git a/CraftBukkit-Patches/0060-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0060-Fix-ItemStack-Unbreakable-Code.patch index 5f5b4ea803..8820bc0ad8 100644 --- a/CraftBukkit-Patches/0060-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0060-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From dae46463bd9260d31d69fd7f581933bd54aa7c41 Mon Sep 17 00:00:00 2001 +From 825919ad07bcfd42acb7ecb702bf6b81ab3ed65c 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/0061-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0061-Try-and-Debug-Crash-Reports-Crashing.patch index 784ea9fdeb..bef2c08dae 100644 --- a/CraftBukkit-Patches/0061-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0061-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,11 +1,11 @@ -From b48d48b32f53d99a57e02f5c1f01a4a55a3036d2 Mon Sep 17 00:00:00 2001 +From 5229014af5bb815790e2345c4fdbde5d867c3ef2 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 0aab39b..49524b1 100644 +index c82c67b..70dbd88 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -743,7 +743,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch index 30fc085b7d..3791bf5226 100644 --- a/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From a80d57a9e6782a14b839f6fab8908a18377440f7 Mon Sep 17 00:00:00 2001 +From 4f5473f7769a1c5f7f51252a4817522a1a8ed1d7 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 8f3cd56..fd3f457 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 49524b1..254e4bd 100644 +index 70dbd88..a16a2d2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -655,7 +655,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0063-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0063-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index 50f3208cf0..4c22fe9a02 100644 --- a/CraftBukkit-Patches/0063-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0063-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From 8fb434691394ab4b9de38a4c61ecb5f5717a3449 Mon Sep 17 00:00:00 2001 +From 9ac4a3b1609dd19bb6f8b14f37172207bf9ec6c0 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/0064-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0064-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index c8d6f69596..4af4bec460 100644 --- a/CraftBukkit-Patches/0064-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0064-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From 2aaf2dce8108cd38f4107ef765439502d8efb823 Mon Sep 17 00:00:00 2001 +From 293c8c84dca0a789d28c3dcdefa8c9b46f77467a 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 diff --git a/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch index 7024b9c5ab..94badb1cda 100644 --- a/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From c692d076435e90e261ebbe905d5bc87da7c1679f Mon Sep 17 00:00:00 2001 +From ad0645db8fc6714568aa8ac47dd5618e3ad62132 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/CraftBukkit-Patches/0066-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0066-Configurable-Ping-Sample-Size.patch index d4e8dee71b..676fed5f5d 100644 --- a/CraftBukkit-Patches/0066-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0066-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 249686d2f9467edaef54884e2fdc48617e7a9252 Mon Sep 17 00:00:00 2001 +From dbfad51762956d4bc6c5c5d72cbf0f3a2badde7d 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/CraftBukkit-Patches/0067-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0067-Add-Optional-Tick-Shuffling.patch index 47d565806a..5377a84207 100644 --- a/CraftBukkit-Patches/0067-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0067-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From acd9b760ba646677e6794d65d8a3a9bbad1c073d Mon Sep 17 00:00:00 2001 +From 61113aa5f7710ecae31ddc374322342efc928f17 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/0068-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch index 7d4b670cda..c2a803956c 100644 --- a/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 42384124ef71bf2c0c1a5747cad64dcb5b523307 Mon Sep 17 00:00:00 2001 +From 2514d0515c9a29dafd7394e6c6f0becb9d81334e 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/0069-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch index fc03bf4eb1..031080626d 100644 --- a/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From b8003723a21e465327a9ba3d99bcf3b57daa0a51 Mon Sep 17 00:00:00 2001 +From c055436cae43c418f24f4238d0faa39e761c0de2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions @@ -19,7 +19,7 @@ index eb552e2..5702cb0 100644 public Entity(World world) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b78b273..f0921e8 100644 +index c2f5ee1..b410f3b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1967,7 +1967,8 @@ public abstract class EntityLiving extends Entity { diff --git a/CraftBukkit-Patches/0070-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0070-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 26caab0e0f..6be251dce2 100644 --- a/CraftBukkit-Patches/0070-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0070-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From 7ed8ec16ceaeeaee355f715e3476742ff4b1d1a7 Mon Sep 17 00:00:00 2001 +From 3fec87491b69ba4cc3faaad819eb9c2fb9546836 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/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch index 48db03e3e2..acee3695cf 100644 --- a/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From c51471c316849ffe05d17d82a3e8248ff534ed17 Mon Sep 17 00:00:00 2001 +From e40f3f6833f52da858a3b9592681eac68298d92e 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 83a4551..04559c9 100644 +index e2b215c..859ddf0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1142,9 +1142,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0072-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0072-Add-Option-to-Silence-CommandBlock-Console.patch index 012972feea..4603f82926 100644 --- a/CraftBukkit-Patches/0072-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0072-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From d875e5714d617ab616bf274212d3fd5dc91fadef Mon Sep 17 00:00:00 2001 +From fac5dc144febec9c664316b79aa4799592888a93 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/0073-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch index 1a1f655115..e49ab21837 100644 --- a/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 5a31cfa1e3050f3c351c9a45c49568f38a31afa6 Mon Sep 17 00:00:00 2001 +From 8b1cdd8774c5e2290e60cbc7f2df4de530df81e0 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/0074-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch index fb5b53ac2e..379ba60449 100644 --- a/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch @@ -1,11 +1,11 @@ -From 8f32bb47908017305238eeec8b2d90a3f0c5d256 Mon Sep 17 00:00:00 2001 +From 0a694a65a56becdefe1a82df4e7efc077e4b803b 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 04559c9..4b057d1 100644 +index 859ddf0..c52eeae 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1902,7 +1902,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0075-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0075-Cap-Channel-Registrations.patch index 1459371ecc..38155f3113 100644 --- a/CraftBukkit-Patches/0075-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0075-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From 951f5235a02bb1cce34a114da1f253e448edb402 Mon Sep 17 00:00:00 2001 +From 15992a6545ebf64c4125cc9c71680827b5e85efa 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/0076-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0076-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 6c61e9aea8..3fc7bc0714 100644 --- a/CraftBukkit-Patches/0076-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0076-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From cba95eeba900ee8853e8b8ca7e2290798e18eb12 Mon Sep 17 00:00:00 2001 +From d9b1b2946e2c2db031144ba4dc96b5e06f297b79 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/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch index 8268f9238f..5e0387688c 100644 --- a/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From a2322f4d7c0497bb172db22586539e2cfa7f22ab Mon Sep 17 00:00:00 2001 +From b723699d1ae2408c45f98353648ebbdec734a360 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/0078-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0078-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 1c538efc21..569107cdd6 100644 --- a/CraftBukkit-Patches/0078-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0078-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 3203e2ff437a39fa1697c2624f3609450ec9aa90 Mon Sep 17 00:00:00 2001 +From e2edc5504ae83e934ac0df17db00f7d0b589def7 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/0079-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0079-Prevent-hoppers-from-loading-chunks.patch index 24d4cec387..d98c0f5306 100644 --- a/CraftBukkit-Patches/0079-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0079-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 35d54b80614097d23ea65b2d8ffc21bd69999838 Mon Sep 17 00:00:00 2001 +From 5422f5ffcbf36b7d2857dfcb23bdd1831db29f92 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/0080-Guard-Entity-List.patch b/CraftBukkit-Patches/0080-Guard-Entity-List.patch index e14358dbdb..61164d855f 100644 --- a/CraftBukkit-Patches/0080-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0080-Guard-Entity-List.patch @@ -1,11 +1,11 @@ -From 635e7f0a742e57728246287c937d3b65c754e9bc Mon Sep 17 00:00:00 2001 +From 6c6bd2c67ce8837dcb7b21a2468a0e5e70b9531d 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 2eaa1cb..da7a546 100644 +index a6bd744..2cc87d0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -33,7 +33,32 @@ public abstract class World implements IBlockAccess { @@ -50,7 +50,7 @@ index 2eaa1cb..da7a546 100644 public CraftWorld getWorld() { return this.world; -@@ -1309,6 +1335,7 @@ public abstract class World implements IBlockAccess { +@@ -1312,6 +1338,7 @@ public abstract class World implements IBlockAccess { org.spigotmc.ActivationRange.activateEntities(this); // Spigot timings.entityTick.startTiming(); // Spigot @@ -58,7 +58,7 @@ index 2eaa1cb..da7a546 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1347,12 +1374,15 @@ public abstract class World implements IBlockAccess { +@@ -1350,12 +1377,15 @@ public abstract class World implements IBlockAccess { this.getChunkAt(j, l).b(entity); } diff --git a/CraftBukkit-Patches/0081-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0081-Fix-ConcurrentModificationException-while-being-idle.patch index 73a6eddf74..232b540d0b 100644 --- a/CraftBukkit-Patches/0081-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0081-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 1f9470cf507a024512f543ec2d7c5380be8a46d7 Mon Sep 17 00:00:00 2001 +From aad78355beec91b7347c5a3efe52e2cb987ce175 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 da7a546..1c83942 100644 +index 2cc87d0..76c5f4c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,4 +1,4 @@ @@ -15,7 +15,7 @@ index da7a546..1c83942 100644 import com.google.common.base.Function; import com.google.common.base.Objects; -@@ -1013,6 +1013,7 @@ public abstract class World implements IBlockAccess { +@@ -1016,6 +1016,7 @@ public abstract class World implements IBlockAccess { this.everyoneSleeping(); } @@ -23,7 +23,7 @@ index da7a546..1c83942 100644 int i = entity.ab; int j = entity.ad; -@@ -1029,6 +1030,7 @@ public abstract class World implements IBlockAccess { +@@ -1032,6 +1033,7 @@ public abstract class World implements IBlockAccess { this.entityList.remove(index); } // CraftBukkit end diff --git a/CraftBukkit-Patches/0082-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0082-Cancellable-WitherSkull-potion-effect.patch index b8d6f0568d..294553d6e6 100644 --- a/CraftBukkit-Patches/0082-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0082-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 13a1f18344e24a5438f44fdff9f70c44e8e10683 Mon Sep 17 00:00:00 2001 +From 9d8a4d8b4809e707fe190917ba287f66d040cb01 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/0083-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch index af7243b592..a5dd8dd8fb 100644 --- a/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 4490d6214b67fb69d54128020322dd2db7ba593c Mon Sep 17 00:00:00 2001 +From c3f64231ce40efc2de10b80e0126efaa5cde4f26 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! @@ -27,7 +27,7 @@ index 5702cb0..a4a6352 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4b057d1..14c6f43 100644 +index c52eeae..461f0ea 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1065,7 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0084-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0084-Configurable-dragon-death-and-wither-spawn-sounds.patch index 3d2d32c750..1f041f2dba 100644 --- a/CraftBukkit-Patches/0084-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0084-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 58291d792f96e63773dbd9a15a4980f7db5a5354 Mon Sep 17 00:00:00 2001 +From 75151f1551fd4bf5fbc99d84ce782a9f21758cd6 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/0085-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0085-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index de688a3d4d..02237e496b 100644 --- a/CraftBukkit-Patches/0085-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0085-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From 6967dc0482213279e39508c5bea23f7ae5d65125 Mon Sep 17 00:00:00 2001 +From 4f85914f6e72b5e14741e5b84a81c8e3d2b98ea4 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 e96bbd1..ebbb56e 100644 +index 67f2de5..4753c18 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1008,7 +1008,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0086-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0086-Treat-Bungee-as-Online-Mode.patch index c27bede27f..7410b7123f 100644 --- a/CraftBukkit-Patches/0086-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0086-Treat-Bungee-as-Online-Mode.patch @@ -1,11 +1,11 @@ -From 466cbe3cfd558b1dd344f236be5be3a5f3323387 Mon Sep 17 00:00:00 2001 +From b9e8445f12f22f9d89a9266912d67a9d7a1e4e47 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 852f8b4..e8ba061 100644 +index d6a01a9..6b560b0 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -196,7 +196,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0087-Add-Conversion-Message.patch b/CraftBukkit-Patches/0087-Add-Conversion-Message.patch index 9fae763de4..633b84ba71 100644 --- a/CraftBukkit-Patches/0087-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0087-Add-Conversion-Message.patch @@ -1,11 +1,11 @@ -From d414fed5ea4e5d047d7e881245703185e4faae45 Mon Sep 17 00:00:00 2001 +From cf66da81fbf35eb187b836bec00bd5cde3c0968c 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 e8ba061..f5d7bd0 100644 +index 6b560b0..8a8e05b 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -561,6 +561,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0088-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0088-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index 8632bb42b4..212d3c7a25 100644 --- a/CraftBukkit-Patches/0088-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0088-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From 683a2a0d46445ee9c867d509cc2d600dfeaa984f Mon Sep 17 00:00:00 2001 +From 53a7065d5efcc84f18359165baf714339760f67e 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/0089-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0089-Print-Stack-on-InternalException.patch index 8f9398e906..a2c00d0f5f 100644 --- a/CraftBukkit-Patches/0089-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0089-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From 3319e690a4530c8e0cefe04fe6073f9ff821bb3e Mon Sep 17 00:00:00 2001 +From 4c7bf255c8c29256c86098aeff0a46c6d223032b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException diff --git a/CraftBukkit-Patches/0090-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0090-Use-Offline-Player-Data-Once-if-Required.patch index 239f9f1438..b4a10f4d0d 100644 --- a/CraftBukkit-Patches/0090-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0090-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From b4baf71ea9e422d9a988672e09f1a616628f9aab Mon Sep 17 00:00:00 2001 +From c0f8bb52a9cd63f07574e4a35d7ac05f5935eb32 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/0091-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0091-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 4036adf605..db4fe2ce63 100644 --- a/CraftBukkit-Patches/0091-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0091-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From 6bcd206178f798f378bb08293959ec828c244460 Mon Sep 17 00:00:00 2001 +From 9dd60ebc834af9cfe3089a1252cf4da72a30f3b2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0092-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0092-Check-for-blank-OfflinePlayer-Names.patch index a255e14467..dee45f37a0 100644 --- a/CraftBukkit-Patches/0092-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0092-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From e3d7454ea1c7f649a3f04a4526304f94e9fa8138 Mon Sep 17 00:00:00 2001 +From acffc6ce7a15167908463edcf538e2b8073a069e 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/0093-Fix-Player-Banning.patch b/CraftBukkit-Patches/0093-Fix-Player-Banning.patch index 1d704631c9..6ed4275b49 100644 --- a/CraftBukkit-Patches/0093-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0093-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 0d0f490c0a042f2613d84c9c8cd974fd1dc01cc5 Mon Sep 17 00:00:00 2001 +From 2e56c863ba5d4ae0afee8be802e7b05ee8108458 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/0094-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0094-Fix-ban-expire-dates.patch index eb76efb9b2..5c4b8734af 100644 --- a/CraftBukkit-Patches/0094-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0094-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From eb30c7e8e0898dedb0142c8284b224220dc08192 Mon Sep 17 00:00:00 2001 +From ab7167cc5c00b7e8eb77568b2dd2a2e27a2d1da0 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/0095-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0095-Correct-Ban-Expiration.patch index 940726dde8..363bdbc8ed 100644 --- a/CraftBukkit-Patches/0095-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0095-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From 08ddd8db2001011c597d45cc59dc7e816250a467 Mon Sep 17 00:00:00 2001 +From fc1275c9257b95dda24800955fdf1ebeffbaadac Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/CraftBukkit-Patches/0096-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0096-Convert-Horses-owner-to-UUID.patch index 1bfde6a4b1..0b5447daf7 100644 --- a/CraftBukkit-Patches/0096-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0096-Convert-Horses-owner-to-UUID.patch @@ -1,11 +1,11 @@ -From 429cd2e895873f3403e564cffda453b8ceb68a0e Mon Sep 17 00:00:00 2001 +From 2dc192572acf60e2b40c07d744e06475ad6b77f8 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 ba06096..5b9b879 100644 +index 17a606a..abc7120 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -983,6 +983,17 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener, IJu diff --git a/CraftBukkit-Patches/0097-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0097-Add-Score.isScoreSet-Z-API.patch index 07da030bb0..3df869fc9e 100644 --- a/CraftBukkit-Patches/0097-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0097-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From dbe1a9c8b20c63f36dfb01ae9d613e95bdf9f87e Mon Sep 17 00:00:00 2001 +From fe92dc8144305d266d435a95d21b8fddb40c675a 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/0098-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0098-Log-null-TileEntity-Owner.patch index 38c905ab51..26deab902e 100644 --- a/CraftBukkit-Patches/0098-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0098-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From e9430972f96ff863952fb17f9cc27154f8b79377 Mon Sep 17 00:00:00 2001 +From d9f75e38c44bbc65960864ff9d94beb0a97658d6 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/0099-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0099-Don-t-special-case-invalid-usernames-for-UUIDs.patch index b6119ef20c..edb5944438 100644 --- a/CraftBukkit-Patches/0099-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0099-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From 9d5425d4a49e1f81b886a6d3b81430b94ed7f9a3 Mon Sep 17 00:00:00 2001 +From bee2a97f30927ae5c4c64cb6748b060fc86102f8 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/0100-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0100-Convert-player-skulls-async.patch index 0aea991cd0..dbe11f68b2 100644 --- a/CraftBukkit-Patches/0100-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0100-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From d70a9db30806a6aaf6f78311b2e1e29f8e11ecd1 Mon Sep 17 00:00:00 2001 +From 1440b4a8c3469ba7d6f0360235d92b39f8e2b144 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/0101-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0101-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 6622c6b4bf..79970343fc 100644 --- a/CraftBukkit-Patches/0101-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0101-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,11 +1,11 @@ -From 52ac4c5e5b413c96eebf9d041a645fdb30cd0de3 Mon Sep 17 00:00:00 2001 +From 095e80acaed0801901e5f0e7029786bf111830fe 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 1c83942..8a79f5e 100644 +index 76c5f4c..a085719 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -127,6 +127,8 @@ public abstract class World implements IBlockAccess { @@ -17,7 +17,7 @@ index 1c83942..8a79f5e 100644 public CraftWorld getWorld() { return this.world; -@@ -507,6 +509,9 @@ public abstract class World implements IBlockAccess { +@@ -510,6 +512,9 @@ public abstract class World implements IBlockAccess { } // CraftBukkit end iblockdata.getBlock().doPhysics(this, blockposition, iblockdata, block); diff --git a/CraftBukkit-Patches/0102-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0102-Check-Skull-canPlace.patch index 54cc7f8bfc..7a5051d3b8 100644 --- a/CraftBukkit-Patches/0102-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0102-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 8828d915ce0c8b6e36728956002b2b0658de77a7 Mon Sep 17 00:00:00 2001 +From f2216c44f5be2c9cccd99b4f5dbab4ad311352bd 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/0103-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0103-Fix-race-condition-that-could-kill-connections-befor.patch index 538ec6b06f..0e3c706de7 100644 --- a/CraftBukkit-Patches/0103-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0103-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 15f8edb4bcafa60c62d99833aad568ad91e424a0 Mon Sep 17 00:00:00 2001 +From 6a6f6dd1e01b57ef61f4c90abc1d2c2ecfae00db Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they diff --git a/CraftBukkit-Patches/0104-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0104-Configurable-UserCache-cap.patch index 70e9e35a60..b05b9e4663 100644 --- a/CraftBukkit-Patches/0104-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0104-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From a61b421ea6808f23d4da2000f67dc8b6b5250403 Mon Sep 17 00:00:00 2001 +From b419d40ea1a6849d64dbe72e34dc40f4a1cfe9c6 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap diff --git a/CraftBukkit-Patches/0105-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0105-Implement-PlayerSpawnLocationEvent.patch index 205b31dd04..b7ff897b16 100644 --- a/CraftBukkit-Patches/0105-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0105-Implement-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 9a0877242c981ac2f3f99bd00432cf7a90a5c777 Mon Sep 17 00:00:00 2001 +From 1ba0da9d71e285dd8b937386a676bdac5b218393 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:05:19 +0200 Subject: [PATCH] Implement PlayerSpawnLocationEvent. diff --git a/CraftBukkit-Patches/0106-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0106-Cap-Objective-Score-Length.patch index e09b03a38c..9d1273d4e8 100644 --- a/CraftBukkit-Patches/0106-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0106-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From 25ef2e1d26817356274ebd8523594cf9b93074c7 Mon Sep 17 00:00:00 2001 +From f43b9f8ca15034bc6c64d21d2060c77ae85d35cc 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/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch index 7ef3b57239..6daa7ce585 100644 --- a/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From 682946385f860c723b7303cedb58048b8c1c7632 Mon Sep 17 00:00:00 2001 +From 35ecabbc407286cfb38ae49e37b4429c357fa0f0 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,7 +6,7 @@ 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 14c6f43..74c25a4 100644 +index 461f0ea..e7c6f1e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1127,7 +1127,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0108-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0108-Configurable-save-on-stop-only-for-UserCache.patch index 7c63591c1a..838919f62a 100644 --- a/CraftBukkit-Patches/0108-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0108-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,11 +1,11 @@ -From def6115f5c235487bdd296db0fe350bf4afce2e2 Mon Sep 17 00:00:00 2001 +From 737b533613dba19eb9b98f1db8a40b77c33c3676 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 ebbb56e..650e2c1 100644 +index 4753c18..bf0b825 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -485,6 +485,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0109-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0109-Prevent-Unbounded-IntCache-Growth.patch index 955c76828c..5c3f784980 100644 --- a/CraftBukkit-Patches/0109-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0109-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From b513ce477e791cf530b823da2ef36e473dadf87e Mon Sep 17 00:00:00 2001 +From bbadef23001534073b04d18671f35bf4fc689c98 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/0110-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch index 7e31200dc4..9110da1cbe 100644 --- a/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From 5451463a4d33e15349c9d4a5a6ce10b000158f02 Mon Sep 17 00:00:00 2001 +From e9abdb9e15800ccb98b33b114206deb72751d948 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/0111-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0111-Cross-World-Entity-Teleportation.patch index 93b86579ab..0a8988409f 100644 --- a/CraftBukkit-Patches/0111-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0111-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From d2d1f852267723ee3dfc5e8a975d74f2d26f93ce Mon Sep 17 00:00:00 2001 +From 8dcb680f3c7620089b92fe0f47f20cb6321d7b7b 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/0112-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0112-Limit-block-placement-interaction-packets.patch index 81976e9610..dcc3e57202 100644 --- a/CraftBukkit-Patches/0112-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0112-Limit-block-placement-interaction-packets.patch @@ -1,4 +1,4 @@ -From a525bee009d7ad526e5c8dfa616f7c82b9643f35 Mon Sep 17 00:00:00 2001 +From ee0cfdc769fd155ab0a7d925021cb918ab2b2e0a 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 @@ -41,7 +41,7 @@ index cb0356e..0000000 - } -} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 74c25a4..371b3d1 100644 +index e7c6f1e..b06597a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -850,6 +850,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0113-Better-item-validation.patch b/CraftBukkit-Patches/0113-Better-item-validation.patch index a76bf2418f..becdad6b53 100644 --- a/CraftBukkit-Patches/0113-Better-item-validation.patch +++ b/CraftBukkit-Patches/0113-Better-item-validation.patch @@ -1,4 +1,4 @@ -From 77058805fac70e9b35debdba1a12f5a05f1f9510 Mon Sep 17 00:00:00 2001 +From ed973083147e379a9f5c7d279371bcbee8479fc0 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation diff --git a/CraftBukkit-Patches/0114-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0114-Further-Seed-Customisation.patch index 7dba0fc57b..aed03ad3b9 100644 --- a/CraftBukkit-Patches/0114-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0114-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From dbd85e39718a05cd2202f76677c281631261be12 Mon Sep 17 00:00:00 2001 +From 74e653a9ea9ca9c082ba6230c5460aeaf39e9de5 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/0115-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0115-Disable-ResourceLeakDetector.patch index 97b4080891..43ddde28a1 100644 --- a/CraftBukkit-Patches/0115-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0115-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 2513194a4ac12635e4c1cb84fc4c3f39d1c58f59 Mon Sep 17 00:00:00 2001 +From 81669fdb7dd4c2e840bb0007caca901252909d19 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 650e2c1..28b1679 100644 +index bf0b825..32290a0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -122,6 +122,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0116-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0116-Add-More-Information-to-session.lock-Errors.patch index 75e17f3cad..4c0a95ac9d 100644 --- a/CraftBukkit-Patches/0116-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0116-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From 337f77b57686dd849102ccc71ba0fddba043a746 Mon Sep 17 00:00:00 2001 +From 514102b4812128ada9ef5ad40e69c9bc69836991 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/0117-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0117-Safer-JSON-Loading.patch index 5dd9a5e288..8b5f07dec4 100644 --- a/CraftBukkit-Patches/0117-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0117-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From cc03db48e9274551d0e55b7ed45b88bcd36210ad Mon Sep 17 00:00:00 2001 +From 00ba6b1058d452bd2e2ecd6e7246de98b74581a7 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading diff --git a/CraftBukkit-Patches/0118-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0118-Add-CommandLine-EULA-Flag.patch index c94481009b..55b58a347f 100644 --- a/CraftBukkit-Patches/0118-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0118-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From 517d8b988136a5d9746d9ba11c2c3bb8ba98df72 Mon Sep 17 00:00:00 2001 +From 49f7c06001e54932cb6b9b11d4dfaf182d97ffd5 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 f5d7bd0..2659703 100644 +index 8a8e05b..0f8c10a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -126,7 +126,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0119-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0119-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 8930f1a0c5..2561a1b5f4 100644 --- a/CraftBukkit-Patches/0119-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0119-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From 05af5b15f00a18947d51a29774568c54878ed4e5 Mon Sep 17 00:00:00 2001 +From 800cf4ce6d592914dcfc664ae67f2fa2fc8eb42e 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/0120-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0120-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index dd6bfc2021..974eb79dcf 100644 --- a/CraftBukkit-Patches/0120-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0120-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From c4fe74ae25ea8a0bf39d876df16b3703f3809301 Mon Sep 17 00:00:00 2001 +From 3231bb87a8c52c07b52f2ae1c8afa5ebadb6fbb8 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/0121-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch index 60737634e8..329309b319 100644 --- a/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch @@ -1,4 +1,4 @@ -From d8413b16c197862cbf7787bddb9e0900984772de Mon Sep 17 00:00:00 2001 +From 2b3de9dd1ca7d6d57e840342da812740bc360e2f 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/0122-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0122-Make-moved-wrongly-limit-configurable.patch index 21ec97f1ca..e51d8d5934 100644 --- a/CraftBukkit-Patches/0122-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0122-Make-moved-wrongly-limit-configurable.patch @@ -1,4 +1,4 @@ -From e4eaae02de9a9d2be4816c7d260d39011924fd90 Mon Sep 17 00:00:00 2001 +From 56f43f705bf61748a904e04db6e560eb0281038e 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/CraftBukkit-Patches/0123-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0123-Fix-Null-Tile-Entity-Worlds.patch index a4188ac76a..b52f694e25 100644 --- a/CraftBukkit-Patches/0123-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0123-Fix-Null-Tile-Entity-Worlds.patch @@ -1,14 +1,14 @@ -From a5c2d12d9f349e8eed55096b5ac9fa0c02bc90f6 Mon Sep 17 00:00:00 2001 +From 13b7df85cb3e2d7e9f1b6c819d188c3579097781 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 8a79f5e..bb49102 100644 +index a085719..3ffb6da 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1935,6 +1935,7 @@ public abstract class World implements IBlockAccess { +@@ -1938,6 +1938,7 @@ public abstract class World implements IBlockAccess { } } diff --git a/CraftBukkit-Patches/0124-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0124-Make-moved-too-quickly-limit-configurable.patch index bfd850f284..337fcbe2b8 100644 --- a/CraftBukkit-Patches/0124-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0124-Make-moved-too-quickly-limit-configurable.patch @@ -1,4 +1,4 @@ -From 93b28fa5f8a98d8fe9567b0a197bd7e23d9cb84e Mon Sep 17 00:00:00 2001 +From 0acc1d4540fffea7e59df69727b42f566b203d30 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/CraftBukkit-Patches/0125-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0125-Apply-NBTReadLimiter-to-more-things.patch index aa3040b3e7..dbaf2f718c 100644 --- a/CraftBukkit-Patches/0125-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0125-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 4f76cd8a788d4c9e8e96a68376514d806c083e51 Mon Sep 17 00:00:00 2001 +From b2db0dd7ae5d9e03d10f5ed0833057c207b449c9 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/0126-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0126-Allow-Attribute-Capping.patch index 37c648f758..0af649dda0 100644 --- a/CraftBukkit-Patches/0126-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0126-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From 7cd90b5537aa9372401f7496c964eea8a0354e7b Mon Sep 17 00:00:00 2001 +From ff1cbc9c27c12f0ade79b8a3791321ee31cce996 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/0127-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0127-Only-fetch-an-online-UUID-in-online-mode.patch index bf695ee47b..3b7f7a28cf 100644 --- a/CraftBukkit-Patches/0127-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0127-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 94f94681f66dc7ae68a59a5746574386927fb190 Mon Sep 17 00:00:00 2001 +From 249003af99a25a9fbad7dbba89b7b3fe01dbf5f7 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/0128-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0128-Filter-attribute-modifiers-which-cause-the-attribute.patch index 2f1a283d2f..9c449811c9 100644 --- a/CraftBukkit-Patches/0128-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0128-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 7f7b49e6a843d08349cadf7ad0a2c007f67b3f36 Mon Sep 17 00:00:00 2001 +From 747c9586e1c1b513205364465986bf165a354748 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 diff --git a/CraftBukkit-Patches/0129-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0129-Plug-WorldMap-Memory-Leak.patch index 1748cfe371..1013a7e486 100644 --- a/CraftBukkit-Patches/0129-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0129-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 1f9f586e2ad20431069bb4596cb6560300b33626 Mon Sep 17 00:00:00 2001 +From a93dbd34267517151430f2dbab273a5ae3b49802 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,10 +18,10 @@ index c29e3f7..6f013eb 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 bb49102..55468dc 100644 +index 3ffb6da..d09942c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1003,6 +1003,23 @@ public abstract class World implements IBlockAccess { +@@ -1006,6 +1006,23 @@ public abstract class World implements IBlockAccess { entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); diff --git a/CraftBukkit-Patches/0130-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0130-Fix-Corrupted-Trapped-Chest.patch index ec8687b7e2..f2366c61a2 100644 --- a/CraftBukkit-Patches/0130-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0130-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From 6017088e79cf6cf6cedf9b6f61ed67f7e89fb1a7 Mon Sep 17 00:00:00 2001 +From 117e10736f1bcaa9bae8945314ae91bbb2935a28 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest diff --git a/CraftBukkit-Patches/0131-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0131-Remove-uneeded-validation.patch index 0360f49cd8..a2163f6f6c 100644 --- a/CraftBukkit-Patches/0131-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0131-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From 643832eb5bb34fe157f8e1795153bb6b735b1a4a Mon Sep 17 00:00:00 2001 +From 42e2a4e371d3257d5ae94cde52f3552f2b11d0a4 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/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch index 027854d3b1..650ef8f180 100644 --- a/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch @@ -1,11 +1,11 @@ -From b86c56dc176b1d29be41bcf982cbf6c300896b33 Mon Sep 17 00:00:00 2001 +From a3416510c442229effa85bc8e324ec85f92dd4ce 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 b7355b0..b405d3c 100644 +index 7738af4..53936de 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1138,7 +1138,7 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/CraftBukkit-Patches/0133-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0133-Make-debug-logging-togglable.patch index e05b66c06f..987b23ac8c 100644 --- a/CraftBukkit-Patches/0133-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0133-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From 7dc51aec59043404fb3a1022fb438f2c3c09d190 Mon Sep 17 00:00:00 2001 +From e20fadfcb0b56c690c29ebd4acddc0b1bc100814 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/0134-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0134-Skip-invalid-enchants-in-CraftMetaItem.patch index 3b4a532e99..aa0f4f4e17 100644 --- a/CraftBukkit-Patches/0134-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0134-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From f2e740f9d48e3f5ab8879c87d81cf30e881534f9 Mon Sep 17 00:00:00 2001 +From c54023cbcbbe58062508491bb0491dbb821dd71d 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 diff --git a/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch index 22e8445d57..29a2904431 100644 --- a/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From 5812a23872e2c522bc10842956f65d1e5101b619 Mon Sep 17 00:00:00 2001 +From 847098ee587927d368ea75de08e1cd65f3aba0b4 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 diff --git a/CraftBukkit-Patches/0136-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0136-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index cffe8139aa..18ee9dccda 100644 --- a/CraftBukkit-Patches/0136-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0136-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 7e931f72c4b52af11333041f2da4f348509f6991 Mon Sep 17 00:00:00 2001 +From 6f0d6235a3d51a857f8e2c59b96af9e196dbaa02 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/0137-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0137-Configurable-Hanging-Tick.patch index 9133613631..b0bd1fd325 100644 --- a/CraftBukkit-Patches/0137-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0137-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From f9752410ca21d1c992996760cf70abc4665f8384 Mon Sep 17 00:00:00 2001 +From f3190586ed2e1760267ef859761294383c4ec07c 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/CraftBukkit-Patches/0138-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0138-Refactor-ItemDoor-Place.patch index bb46acd737..258c4285cb 100644 --- a/CraftBukkit-Patches/0138-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0138-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From 32345e53860c30cac70298b836464fd0dea16503 Mon Sep 17 00:00:00 2001 +From 02237184015ff86418a374b78dd54607433e0ff5 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/0139-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch index 9c2a7ca9e4..32df9b72a0 100644 --- a/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 7a050d4577022432d8be15a1d308a61197f34aeb Mon Sep 17 00:00:00 2001 +From d49b826db9f982fd0909efd219787ce33707c356 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/0140-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0140-Use-Standard-List-for-EntitySlices.patch index 41933ea8b0..4487409aea 100644 --- a/CraftBukkit-Patches/0140-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0140-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From 8e895caab5ed128184d88c328472f900b88a4a2b Mon Sep 17 00:00:00 2001 +From 77134a53b8c718b84e50cb28cf1c24f5621763bf 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/0141-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch index fea868af41..58d908721e 100644 --- a/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From a3d56cde333f32d169ecb02f997126a45a2b3cbf Mon Sep 17 00:00:00 2001 +From 5392536861c32dcda8377df2c3b3c37ce48955bb 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 55468dc..833d5a4 100644 +index d09942c..048d17d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -129,6 +129,9 @@ public abstract class World implements IBlockAccess { @@ -23,16 +23,16 @@ index 55468dc..833d5a4 100644 public CraftWorld getWorld() { return this.world; -@@ -163,6 +166,8 @@ public abstract class World implements IBlockAccess { - this.N = worldprovider.getWorldBorder(); - this.getServer().addWorld(this.world); // CraftBukkit +@@ -166,6 +169,8 @@ public abstract class World implements IBlockAccess { + this.getServer().addWorld(this.world); + // CraftBukkit end timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings + this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); + this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } public World b() { -@@ -1361,7 +1366,12 @@ public abstract class World implements IBlockAccess { +@@ -1364,7 +1369,12 @@ public abstract class World implements IBlockAccess { timings.entityTick.startTiming(); // Spigot guardEntityList = true; // Spigot // CraftBukkit start - Use field for loop variable @@ -46,7 +46,7 @@ index 55468dc..833d5a4 100644 entity = (Entity) this.entityList.get(this.tickPosition); // CraftBukkit end Entity entity1 = entity.by(); -@@ -1418,14 +1428,20 @@ public abstract class World implements IBlockAccess { +@@ -1421,14 +1431,20 @@ public abstract class World implements IBlockAccess { this.tileEntityListUnload.clear(); } // CraftBukkit end @@ -71,7 +71,7 @@ index 55468dc..833d5a4 100644 continue; } // Spigot end -@@ -1454,7 +1470,8 @@ public abstract class World implements IBlockAccess { +@@ -1457,7 +1473,8 @@ public abstract class World implements IBlockAccess { } if (tileentity.x()) { diff --git a/CraftBukkit-Patches/0142-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0142-Use-FastMatches-for-ItemStack-Dirty-Check.patch index 338253a2d3..78ce4cb326 100644 --- a/CraftBukkit-Patches/0142-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0142-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From f4e0d698393bd3394f42e040a5af7ba28fc39acf Mon Sep 17 00:00:00 2001 +From ee9c226272ebcee35cfbd070c0e354f0cd5e6574 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/0143-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0143-Use-CLQ-for-main-thread-tasks.patch index 17f9ab9513..375667d1e1 100644 --- a/CraftBukkit-Patches/0143-Use-CLQ-for-main-thread-tasks.patch +++ b/CraftBukkit-Patches/0143-Use-CLQ-for-main-thread-tasks.patch @@ -1,11 +1,11 @@ -From 83522bc67098adbbc47cc5b1fed3a5e4b2e05936 Mon Sep 17 00:00:00 2001 +From 0eeaa450168028e4e727629c01492611aa91095a 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 28b1679..c754675 100644 +index 32290a0..89e6ad3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -98,7 +98,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0144-map-decoration-fix.patch b/CraftBukkit-Patches/0144-map-decoration-fix.patch index 10ef375298..b87ed83d9e 100644 --- a/CraftBukkit-Patches/0144-map-decoration-fix.patch +++ b/CraftBukkit-Patches/0144-map-decoration-fix.patch @@ -1,4 +1,4 @@ -From adbd656dcb6dc645c7eadd6a1edb01d89823770a Mon Sep 17 00:00:00 2001 +From 6b40527380526915e7a782674806510418b98bcd Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Sun, 26 Apr 2015 02:14:13 +0300 Subject: [PATCH] map decoration fix diff --git a/CraftBukkit-Patches/0145-Use-Map-for-getPlayer-String-lookup.patch b/CraftBukkit-Patches/0145-Use-Map-for-getPlayer-String-lookup.patch index b384073083..9660a1b3d7 100644 --- a/CraftBukkit-Patches/0145-Use-Map-for-getPlayer-String-lookup.patch +++ b/CraftBukkit-Patches/0145-Use-Map-for-getPlayer-String-lookup.patch @@ -1,4 +1,4 @@ -From 26e3b231d4cc74e13ccbef7d8bae457683e6a25d Mon Sep 17 00:00:00 2001 +From 9b75f018a3dccb9510ac120fda821a1b64e3d0b1 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/CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch b/CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch index 599a506bcd..eb9d70b26b 100644 --- a/CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch +++ b/CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch @@ -1,4 +1,4 @@ -From 826e5a36d65dd521e93c10c6ad8b8d1999469bce Mon Sep 17 00:00:00 2001 +From 514d88656c3a313f8f51770cd3e8bfc172d35059 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,7 +17,7 @@ index 4c6dfb1..a9ea3f5 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 371b3d1..13b9a7b 100644 +index b06597a..0f873ae 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1036,7 +1036,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0147-Optimize-Chunk-Saving-Memory-Allocation-and-Compress.patch b/CraftBukkit-Patches/0147-Optimize-Chunk-Saving-Memory-Allocation-and-Compress.patch index e91ca30b36..b2a13204bf 100644 --- a/CraftBukkit-Patches/0147-Optimize-Chunk-Saving-Memory-Allocation-and-Compress.patch +++ b/CraftBukkit-Patches/0147-Optimize-Chunk-Saving-Memory-Allocation-and-Compress.patch @@ -1,4 +1,4 @@ -From 60c0e933089f0eeaec37a2f0a6efa6d8e0a6be9b Mon Sep 17 00:00:00 2001 +From 8d76759534a15987f4f6a35afe74c7f64f61437f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 29 Aug 2015 13:59:25 -0400 Subject: [PATCH] Optimize Chunk Saving Memory Allocation and Compression diff --git a/CraftBukkit-Patches/0148-More-effecient-RegionFile-zero-ing.patch b/CraftBukkit-Patches/0148-More-effecient-RegionFile-zero-ing.patch index f996317c3e..715f012153 100644 --- a/CraftBukkit-Patches/0148-More-effecient-RegionFile-zero-ing.patch +++ b/CraftBukkit-Patches/0148-More-effecient-RegionFile-zero-ing.patch @@ -1,4 +1,4 @@ -From 3750ad56c7a9ba3fcbc4ecc62d7d5e48da49af26 Mon Sep 17 00:00:00 2001 +From 630c07926fec1744af435452e552445389be028f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 29 Aug 2015 17:48:20 -0400 Subject: [PATCH] More effecient RegionFile zero'ing