diff --git a/patches/server/Fix-CreativeCategory-API.patch b/patches/server/Fix-CreativeCategory-API.patch deleted file mode 100644 index 9e0fb204c9..0000000000 --- a/patches/server/Fix-CreativeCategory-API.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java -@@ -0,0 +0,0 @@ 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/work/CraftBukkit b/work/CraftBukkit index 953d3ddc67..e9f972d674 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 953d3ddc674e5fc3ef04588f9fdcc35643653463 +Subproject commit e9f972d6744d66460a78a868d298c7f543533073