Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (CraftBukkit) (#7624)

Browse Source 
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
This commit is contained in:
Jake Potrebic 2022-03-19 02:33:49 -07:00 committed by GitHub
parent bc68ee09be
commit 855637f967
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/server/0878-Don-t-allow-vehicle-movement-from-players-while-tele.patch → patches/server/0877-Don-t-allow-vehicle-movement-from-players-while-tele.patch
View File

19
patches/server/0877-Fix-CreativeCategory-API.patch
View File

@ -1,19 +0,0 @@
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)

0
patches/server/0879-Implement-getComputedBiome-API.patch → patches/server/0878-Implement-getComputedBiome-API.patch
View File

0
patches/server/0880-Make-some-itemstacks-nonnull.patch → patches/server/0879-Make-some-itemstacks-nonnull.patch
View File

0
patches/server/0881-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch → patches/server/0880-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
View File

0
patches/server/0882-Implement-enchantWithLevels-API.patch → patches/server/0881-Implement-enchantWithLevels-API.patch
View File

0
patches/server/0883-Fix-saving-in-unloadWorld.patch → patches/server/0882-Fix-saving-in-unloadWorld.patch
View File

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 953d3ddc674e5fc3ef04588f9fdcc35643653463
Subproject commit e9f972d6744d66460a78a868d298c7f543533073