aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2022-03-12 15:32:42 -0800
committerGitHub <[email protected]>2022-03-12 15:32:42 -0800
commit87927e176c29082164e15104e4c28e31feaca29c (patch)
tree255c9f8249584b62d1d2448987ab888706bb494e
parentbfa33d955c1cd72226aed07efabdab7f22975a79 (diff)
downloadPaper-87927e176c29082164e15104e4c28e31feaca29c.tar.gz
Paper-87927e176c29082164e15104e4c28e31feaca29c.zip
Fix CreativeCategory API (#7586)
-rw-r--r--patches/server/0878-Fix-CreativeCategory-API.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0878-Fix-CreativeCategory-API.patch b/patches/server/0878-Fix-CreativeCategory-API.patch
new file mode 100644
index 0000000000..6835fb2350
--- /dev/null
+++ b/patches/server/0878-Fix-CreativeCategory-API.patch
@@ -0,0 +1,19 @@
+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)