diff --git a/LICENSE.md b/LICENSE.md index 6d4495236..9e740e157 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -40,7 +40,6 @@ rickyboy320 DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> JRoy ysl3000 -kennytv Machine_Maker Ivan Pekov Camotoy <20743703+Camotoy@users.noreply.github.com> diff --git a/patches/api/0198-Add-item-slot-convenience-methods.patch b/patches/api/0198-Add-item-slot-convenience-methods.patch index 9614f432d..abad4883e 100644 --- a/patches/api/0198-Add-item-slot-convenience-methods.patch +++ b/patches/api/0198-Add-item-slot-convenience-methods.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Sat, 25 Apr 2020 23:31:28 +0200 Subject: [PATCH] Add item slot convenience methods diff --git a/patches/api/0236-Add-PlayerItemCooldownEvent.patch b/patches/api/0236-Add-PlayerItemCooldownEvent.patch index 82d9c9fc6..378f88f6e 100644 --- a/patches/api/0236-Add-PlayerItemCooldownEvent.patch +++ b/patches/api/0236-Add-PlayerItemCooldownEvent.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Tue, 25 Aug 2020 13:45:15 +0200 Subject: [PATCH] Add PlayerItemCooldownEvent diff --git a/patches/api/0237-More-lightning-API.patch b/patches/api/0237-More-lightning-API.patch index f253560ab..3ff480a14 100644 --- a/patches/api/0237-More-lightning-API.patch +++ b/patches/api/0237-More-lightning-API.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Sun, 26 Jul 2020 14:44:16 +0200 Subject: [PATCH] More lightning API diff --git a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch index 75aa75814..9aed50ae8 100644 --- a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 29 Jan 2021 15:13:04 +0100 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent diff --git a/patches/api/0279-Expose-protocol-version.patch b/patches/api/0279-Expose-protocol-version.patch index 79071d45a..c7d7976e0 100644 --- a/patches/api/0279-Expose-protocol-version.patch +++ b/patches/api/0279-Expose-protocol-version.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 26 Mar 2021 11:23:27 +0100 Subject: [PATCH] Expose protocol version diff --git a/patches/api/0313-Missing-Entity-Behavior-API.patch b/patches/api/0313-Missing-Entity-Behavior-API.patch index d36918f52..00f397623 100644 --- a/patches/api/0313-Missing-Entity-Behavior-API.patch +++ b/patches/api/0313-Missing-Entity-Behavior-API.patch @@ -3,7 +3,7 @@ From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Fri, 28 May 2021 21:06:59 -0400 Subject: [PATCH] Missing Entity Behavior API -Co-authored-by: Nassim Jahnke +Co-authored-by: Nassim Jahnke Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java diff --git a/patches/api/0327-Fix-plugin-provides-load-order.patch b/patches/api/0327-Fix-plugin-provides-load-order.patch index 1ee605ad1..74b275da1 100644 --- a/patches/api/0327-Fix-plugin-provides-load-order.patch +++ b/patches/api/0327-Fix-plugin-provides-load-order.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 1 Oct 2021 09:47:00 +0200 Subject: [PATCH] Fix plugin provides load order diff --git a/patches/api/0364-Implement-regenerateChunk.patch b/patches/api/0364-Implement-regenerateChunk.patch index e779ef9bc..775ee5007 100644 --- a/patches/api/0364-Implement-regenerateChunk.patch +++ b/patches/api/0364-Implement-regenerateChunk.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Sat, 5 Feb 2022 20:25:28 +0100 Subject: [PATCH] Implement regenerateChunk diff --git a/patches/removed/1.19.1/0906-Untrash-chat-handling.patch b/patches/removed/1.19.1/0906-Untrash-chat-handling.patch index c10fea24a..069ec1976 100644 --- a/patches/removed/1.19.1/0906-Untrash-chat-handling.patch +++ b/patches/removed/1.19.1/0906-Untrash-chat-handling.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Wed, 8 Jun 2022 21:30:34 +0200 Subject: [PATCH] Untrash chat handling diff --git a/patches/server/0332-Dont-send-unnecessary-sign-update.patch b/patches/server/0332-Dont-send-unnecessary-sign-update.patch index df9c5d007..8eeda30cd 100644 --- a/patches/server/0332-Dont-send-unnecessary-sign-update.patch +++ b/patches/server/0332-Dont-send-unnecessary-sign-update.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Sat, 11 Sep 2021 11:56:51 +0200 Subject: [PATCH] Dont send unnecessary sign update diff --git a/patches/server/0362-Remove-garbage-Java-version-check.patch b/patches/server/0362-Remove-garbage-Java-version-check.patch index d13eb8982..454f32cf5 100644 --- a/patches/server/0362-Remove-garbage-Java-version-check.patch +++ b/patches/server/0362-Remove-garbage-Java-version-check.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Wed, 16 Mar 2022 13:58:16 +0100 Subject: [PATCH] Remove garbage Java version check diff --git a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch b/patches/server/0373-Add-tick-times-API-and-mspt-command.patch index 812faa072..2206f80a2 100644 --- a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch +++ b/patches/server/0373-Add-tick-times-API-and-mspt-command.patch @@ -125,7 +125,7 @@ index 6a00f3d38da8107825ab1d405f337fd077b09f72..d31b5ed47cffc61c90c926a0cd2005b7 public static void registerCommands(final MinecraftServer server) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b04c5433a1e2cdfe69c5b5cbe77b867ebd55c126..d8166025ddd229c065e8c4c3082549f1716c0384 100644 +index 19f38a8d66846d859dd46fb53f3224fe0d7f2eb8..f5fc952e119723d7761408d8ffb95e869d01cb81 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -237,6 +237,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +From: Nassim Jahnke Date: Tue, 25 Aug 2020 13:48:33 +0200 Subject: [PATCH] Add PlayerItemCooldownEvent diff --git a/patches/server/0530-More-lightning-API.patch b/patches/server/0530-More-lightning-API.patch index 5b18a8143..142479579 100644 --- a/patches/server/0530-More-lightning-API.patch +++ b/patches/server/0530-More-lightning-API.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Sun, 26 Jul 2020 14:44:09 +0200 Subject: [PATCH] More lightning API diff --git a/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch index 8056b4b3b..71ca7beca 100644 --- a/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 29 Jan 2021 15:13:11 +0100 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent diff --git a/patches/server/0613-Expose-protocol-version.patch b/patches/server/0613-Expose-protocol-version.patch index 36b559c28..3f7f85dcb 100644 --- a/patches/server/0613-Expose-protocol-version.patch +++ b/patches/server/0613-Expose-protocol-version.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 26 Mar 2021 11:23:17 +0100 Subject: [PATCH] Expose protocol version diff --git a/patches/server/0632-Add-Channel-initialization-listeners.patch b/patches/server/0632-Add-Channel-initialization-listeners.patch index e68cdca32..8a44e55fc 100644 --- a/patches/server/0632-Add-Channel-initialization-listeners.patch +++ b/patches/server/0632-Add-Channel-initialization-listeners.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Thu, 29 Apr 2021 21:19:33 +0200 Subject: [PATCH] Add Channel initialization listeners diff --git a/patches/server/0647-Move-range-check-for-block-placing-up.patch b/patches/server/0647-Move-range-check-for-block-placing-up.patch index 44c4bc732..5f028c360 100644 --- a/patches/server/0647-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0647-Move-range-check-for-block-placing-up.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Wed, 8 Jun 2022 10:52:18 +0200 Subject: [PATCH] Move range check for block placing up diff --git a/patches/server/0672-Missing-Entity-Behavior-API.patch b/patches/server/0672-Missing-Entity-Behavior-API.patch index 6e76bcfa3..e2369be03 100644 --- a/patches/server/0672-Missing-Entity-Behavior-API.patch +++ b/patches/server/0672-Missing-Entity-Behavior-API.patch @@ -3,7 +3,7 @@ From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Mon, 21 Jun 2021 23:56:07 -0400 Subject: [PATCH] Missing Entity Behavior API -Co-authored-by: Nassim Jahnke +Co-authored-by: Nassim Jahnke Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java diff --git a/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch index 2a0037959..c2ff3a02e 100644 --- a/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch +++ b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Thu, 26 Aug 2021 12:09:47 +0200 Subject: [PATCH] Sanitize ResourceLocation error logging diff --git a/patches/server/0737-Execute-chunk-tasks-mid-tick.patch b/patches/server/0737-Execute-chunk-tasks-mid-tick.patch index 11d226c60..ac2df1c4a 100644 --- a/patches/server/0737-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0737-Execute-chunk-tasks-mid-tick.patch @@ -19,7 +19,7 @@ index 23e564b05ba438924180c91f9b19a60731eedd1b..5ec241d49ff5e3a161a39006f05823a5 private MinecraftTimings() {} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d605c4355674644e47ea5ea9e979f7806aed1607..421872f7cc1a3cbb4dc596d0e0fa0f9b63602a8a 100644 +index a7610894e05c763ce405c0a2d91665b83d02980a..097eb29a9fd94d49ff5df71110d250a03d6e4c45 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1303,6 +1303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +From: Nassim Jahnke Date: Sun, 24 Oct 2021 15:49:35 +0200 Subject: [PATCH] Fix Bukkit NamespacedKey shenanigans diff --git a/patches/server/0772-Ensure-valid-vehicle-status.patch b/patches/server/0772-Ensure-valid-vehicle-status.patch index 82002eaa2..f0de5f8c5 100644 --- a/patches/server/0772-Ensure-valid-vehicle-status.patch +++ b/patches/server/0772-Ensure-valid-vehicle-status.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Tue, 28 Sep 2021 09:47:47 +0200 Subject: [PATCH] Ensure valid vehicle status diff --git a/patches/server/0784-Configurable-feature-seeds.patch b/patches/server/0784-Configurable-feature-seeds.patch index 580d46186..0b298aa5e 100644 --- a/patches/server/0784-Configurable-feature-seeds.patch +++ b/patches/server/0784-Configurable-feature-seeds.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Tue, 31 Aug 2021 17:05:27 +0200 Subject: [PATCH] Configurable feature seeds diff --git a/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch index 15bdf422f..2b1bccc6b 100644 --- a/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Thu, 25 Nov 2021 10:25:09 +0100 Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch index b5429f37e..ec1d45e5e 100644 --- a/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Wed, 1 Dec 2021 12:36:25 +0100 Subject: [PATCH] Prevent sending oversized item data in equipment and metadata diff --git a/patches/server/0809-Fix-tripwire-state-inconsistency.patch b/patches/server/0809-Fix-tripwire-state-inconsistency.patch index d567618d3..eba71d413 100644 --- a/patches/server/0809-Fix-tripwire-state-inconsistency.patch +++ b/patches/server/0809-Fix-tripwire-state-inconsistency.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Sun, 19 Dec 2021 21:11:20 +0100 Subject: [PATCH] Fix tripwire state inconsistency diff --git a/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch index 3430e3062..baf913d35 100644 --- a/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch +++ b/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Thu, 16 Dec 2021 09:40:39 +0100 Subject: [PATCH] Configurable max block light for monster spawning diff --git a/patches/server/0830-Reset-placed-block-on-exception.patch b/patches/server/0830-Reset-placed-block-on-exception.patch index abdf99f13..3881c0d6d 100644 --- a/patches/server/0830-Reset-placed-block-on-exception.patch +++ b/patches/server/0830-Reset-placed-block-on-exception.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 7 Jan 2022 11:45:15 +0100 Subject: [PATCH] Reset placed block on exception diff --git a/patches/server/0834-Kick-on-main-for-illegal-chat.patch b/patches/server/0834-Kick-on-main-for-illegal-chat.patch index bc0f8683b..f42872de4 100644 --- a/patches/server/0834-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0834-Kick-on-main-for-illegal-chat.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Mon, 17 Jan 2022 19:47:19 +0100 Subject: [PATCH] Kick on main for illegal chat diff --git a/patches/server/0843-Implement-regenerateChunk.patch b/patches/server/0843-Implement-regenerateChunk.patch index 273d8c3b3..3f73a6ed6 100644 --- a/patches/server/0843-Implement-regenerateChunk.patch +++ b/patches/server/0843-Implement-regenerateChunk.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Mon, 31 Jan 2022 11:21:50 +0100 Subject: [PATCH] Implement regenerateChunk diff --git a/patches/server/0858-Force-close-world-loading-screen.patch b/patches/server/0858-Force-close-world-loading-screen.patch index 523a36619..2ac24f6d7 100644 --- a/patches/server/0858-Force-close-world-loading-screen.patch +++ b/patches/server/0858-Force-close-world-loading-screen.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Wed, 2 Mar 2022 09:45:56 +0100 Subject: [PATCH] Force close world loading screen diff --git a/patches/server/0859-Fix-falling-block-spawn-methods.patch b/patches/server/0859-Fix-falling-block-spawn-methods.patch index 168a31ec9..3c1270d7c 100644 --- a/patches/server/0859-Fix-falling-block-spawn-methods.patch +++ b/patches/server/0859-Fix-falling-block-spawn-methods.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Fri, 4 Mar 2022 20:35:19 +0100 Subject: [PATCH] Fix falling block spawn methods diff --git a/patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch index d79b7fb1b..72862c20c 100644 --- a/patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch +++ b/patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke +From: Nassim Jahnke Date: Thu, 2 Jun 2022 20:35:58 +0200 Subject: [PATCH] Disable component selector resolving in books by default diff --git a/patches/server/0924-Dont-fire-preview-event-for-console.patch b/patches/server/0924-Dont-fire-preview-event-for-console.patch deleted file mode 100644 index a693965b2..000000000 --- a/patches/server/0924-Dont-fire-preview-event-for-console.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Thu, 28 Jul 2022 01:57:24 +0200 -Subject: [PATCH] Dont fire preview event for console - - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6a81076239080ae6457308ca2e3628c3d32691bf..e7d1ccffd4b783518a7b200d440f6f12f2ed0c86 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2600,6 +2600,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -+ // Paper start - fix non-player sender -+ if (entityplayer == null) { -+ return CompletableFuture.completedFuture(ichatbasecomponent); -+ } -+ // Paper end - return CompletableFuture.supplyAsync(() -> { - AsyncPlayerChatPreviewEvent event = new AsyncPlayerChatPreviewEvent(true, entityplayer.getBukkitEntity(), CraftChatMessage.fromComponent(ichatbasecomponent), new LazyPlayerSet(this)); - String originalFormat = event.getFormat(), originalMessage = event.getMessage(); diff --git a/patches/server/0925-Send-block-entities-after-destroy-prediction.patch b/patches/server/0924-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0925-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0924-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0926-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0925-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0926-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0925-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0927-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0926-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0927-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0926-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0928-Add-missing-BlockFadeEvents.patch b/patches/server/0927-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0928-Add-missing-BlockFadeEvents.patch rename to patches/server/0927-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0929-Collision-API.patch b/patches/server/0928-Collision-API.patch similarity index 100% rename from patches/server/0929-Collision-API.patch rename to patches/server/0928-Collision-API.patch diff --git a/work/Bukkit b/work/Bukkit index 632aa1208..ff64962b5 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 632aa120808402af8933aef8d991e7935c9c0130 +Subproject commit ff64962b522ce7bb711573a50d24367a840fa49a diff --git a/work/CraftBukkit b/work/CraftBukkit index 401f1ad58..8f3647242 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 401f1ad587d77df330becb7aaa22e3751a2ef94e +Subproject commit 8f3647242a7eadf8e2a7faf623089767c0466b52