mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-02 16:37:56 +02:00
1358d1e914
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 Bukkit Changes: 881e06e5 PR-725: Add Item Unlimited Lifetime APIs CraftBukkit Changes: 74c08312 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall 64db5126 SPIGOT-6959: Make /loot command ignore empty items for spawn 2d760831 Increase outdated build delay 9ed7e4fb SPIGOT-6138, SPIGOT-6415: Don't call CreatureSpawnEvent after cross-dimensional travel fc4ad813 SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent 59733a2e SPIGOT-6961: Actually return a copy of the ItemMeta Spigot Changes: ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue e19ddabd PR-1011: Add Item Unlimited Lifetime APIs 34d40b0e SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication
20 lines
1.3 KiB
Diff
20 lines
1.3 KiB
Diff
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)
|