mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
3a54fb16 SPIGOT-7296: Add ItemFlag#HIDE_ARMOR_TRIM

CraftBukkit Changes:
55056ad80 SPIGOT-7295: Fix Sniffer data defined in incorrect position
This commit is contained in:
Jake Potrebic 2023-03-15 12:59:34 -07:00
parent 9b0e97b75b
commit a2918a5fea
No known key found for this signature in database
GPG key ID: 27CC63F7CBC866C7
7 changed files with 32 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

11
patches/api/0404-Mark-experimental-api-as-such.patch
View file

@ -1221,6 +1221,17 @@ index b99f26079c14931d443615fa81eac9791080ecb0..dadb5b3563b5835c821a2d55d1f076a5
public interface ChiseledBookshelfInventory extends Inventory {
@Nullable
diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
index 4e637420b9a39b822be19367a16da93f236549b3..615cd9994be8a988b474eb512d9e9b7ace743a7a 100644
--- a/src/main/java/org/bukkit/inventory/ItemFlag.java
+++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
@@ -37,5 +37,6 @@ public enum ItemFlag {
/**
* Setting to show/hide armor trim from armor.
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
HIDE_ARMOR_TRIM;
}
diff --git a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
index 08fd3eca8383cdc2d06c3ce973e8c402d279077e..c845b68217eef87668d0bd725c51181312128f47 100644
--- a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java