diff options
| author | Jake Potrebic <[email protected]> | 2022-03-19 02:33:49 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-19 10:33:49 +0100 |
| commit | 855637f967742784c30559a55e4551f47498cee2 (patch) | |
| tree | aa9bb3d937d6752d42938e3a033a23746f151dc0 | |
| parent | bc68ee09be9606437f1263746d46d2632bcf08f6 (diff) | |
| download | Paper-855637f967742784c30559a55e4551f47498cee2.tar.gz Paper-855637f967742784c30559a55e4551f47498cee2.zip | |
Updated Upstream (CraftBukkit) (#7624)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
e9f972d6 Improve CreativeCategory conversion
c2698249 PR-1034: Fix exception on init of CraftCreativeCategory
f48739ca Add tests for material creative categories
| -rw-r--r-- | patches/server/0877-Don-t-allow-vehicle-movement-from-players-while-tele.patch (renamed from patches/server/0878-Don-t-allow-vehicle-movement-from-players-while-tele.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0877-Fix-CreativeCategory-API.patch | 19 | ||||
| -rw-r--r-- | patches/server/0878-Implement-getComputedBiome-API.patch (renamed from patches/server/0879-Implement-getComputedBiome-API.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0879-Make-some-itemstacks-nonnull.patch (renamed from patches/server/0880-Make-some-itemstacks-nonnull.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0880-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch (renamed from patches/server/0881-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0881-Implement-enchantWithLevels-API.patch (renamed from patches/server/0882-Implement-enchantWithLevels-API.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0882-Fix-saving-in-unloadWorld.patch (renamed from patches/server/0883-Fix-saving-in-unloadWorld.patch) | 0 | ||||
| m--------- | work/CraftBukkit | 0 |
8 files changed, 0 insertions, 19 deletions
diff --git a/patches/server/0878-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0877-Don-t-allow-vehicle-movement-from-players-while-tele.patch index bd0b399825..bd0b399825 100644 --- a/patches/server/0878-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0877-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0877-Fix-CreativeCategory-API.patch b/patches/server/0877-Fix-CreativeCategory-API.patch deleted file mode 100644 index 6835fb2350..0000000000 --- a/patches/server/0877-Fix-CreativeCategory-API.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic <[email protected]> -Date: Sat, 12 Mar 2022 15:19:27 -0800 -Subject: [PATCH] Fix CreativeCategory API - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java -index 0c91897aa532e86e8a37c2359475f5dc0bb6e780..9036c388a1d7fbe7bbb1808d39b6701a6744438d 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java -@@ -13,7 +13,7 @@ public final class CraftCreativeCategory { - .put(CreativeModeTab.TAB_REDSTONE, CreativeCategory.REDSTONE) - .put(CreativeModeTab.TAB_TRANSPORTATION, CreativeCategory.TRANSPORTATION) - .put(CreativeModeTab.TAB_MISC, CreativeCategory.MISC) // Interchangeable in NMS -- .put(CreativeModeTab.TAB_MATERIALS, CreativeCategory.MISC) // Interchangeable in NMS -+ // .put(CreativeModeTab.TAB_MATERIALS, CreativeCategory.MISC) // Interchangeable in NMS // Paper - can't have duplicate keys - .put(CreativeModeTab.TAB_FOOD, CreativeCategory.FOOD) - .put(CreativeModeTab.TAB_TOOLS, CreativeCategory.TOOLS) - .put(CreativeModeTab.TAB_COMBAT, CreativeCategory.COMBAT) diff --git a/patches/server/0879-Implement-getComputedBiome-API.patch b/patches/server/0878-Implement-getComputedBiome-API.patch index 1ca1553fc2..1ca1553fc2 100644 --- a/patches/server/0879-Implement-getComputedBiome-API.patch +++ b/patches/server/0878-Implement-getComputedBiome-API.patch diff --git a/patches/server/0880-Make-some-itemstacks-nonnull.patch b/patches/server/0879-Make-some-itemstacks-nonnull.patch index e2cba95fe4..e2cba95fe4 100644 --- a/patches/server/0880-Make-some-itemstacks-nonnull.patch +++ b/patches/server/0879-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0881-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0880-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch index 78f9466f9f..78f9466f9f 100644 --- a/patches/server/0881-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch +++ b/patches/server/0880-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch diff --git a/patches/server/0882-Implement-enchantWithLevels-API.patch b/patches/server/0881-Implement-enchantWithLevels-API.patch index cad975c396..cad975c396 100644 --- a/patches/server/0882-Implement-enchantWithLevels-API.patch +++ b/patches/server/0881-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0883-Fix-saving-in-unloadWorld.patch b/patches/server/0882-Fix-saving-in-unloadWorld.patch index 9afd9f98f9..9afd9f98f9 100644 --- a/patches/server/0883-Fix-saving-in-unloadWorld.patch +++ b/patches/server/0882-Fix-saving-in-unloadWorld.patch diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 953d3ddc674e5fc3ef04588f9fdcc3564365346 +Subproject e9f972d6744d66460a78a868d298c7f54353307 |