Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 06:47:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix CreativeCategory API (#7586)

Browse Source
This commit is contained in:
Jake Potrebic 2022-03-12 15:32:42 -08:00 committed by GitHub
parent bfa33d955c
commit 87927e176c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/server/0878-Fix-CreativeCategory-API.patch Normal file
View File

@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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)