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:
fdef9473 Correct Material#isFuel for new experimental materials
42811598 SPIGOT-7293: Add Biome#CHERRY_GROVE

CraftBukkit Changes:
968d28df0 Fix availability of experimental datapack features in unit tests
This commit is contained in:
Jake Potrebic 2023-03-15 04:54:45 -07:00
parent 3bc992d8f2
commit 647cf31e61
No known key found for this signature in database
GPG key ID: 27CC63F7CBC866C7
22 changed files with 24 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ Subject: [PATCH] Mark experimental api as such
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 716a40b055e693cfda38d2d8223ce4320919a332..5387070a2f668871334ef522d8a3c645d899372a 100644
index 842a9dd6f92737699529721ec4e06fbc225fa3e6..3c5e90f039f0d2991be442168703526405e18e3d 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -155,12 +155,15 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@ -972,6 +972,18 @@ index d355c91748796f74064b5c34090f1ccafc0f1de0..ab40b68c8c4a32e3ae10708d23065856
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
CHERRY,
}
diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
index 5d8fa5b39a5d50cca48ba63af3a84b80f279b649..612ebdd08816438f5532f367ce2f64eb3a9803ff 100644
--- a/src/main/java/org/bukkit/block/Biome.java
+++ b/src/main/java/org/bukkit/block/Biome.java
@@ -72,6 +72,7 @@ public enum Biome implements Keyed, net.kyori.adventure.translation.Translatable
FROZEN_PEAKS,
JAGGED_PEAKS,
STONY_PEAKS,
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
CHERRY_GROVE,
/**
* Represents a custom Biome
diff --git a/src/main/java/org/bukkit/block/ChiseledBookshelf.java b/src/main/java/org/bukkit/block/ChiseledBookshelf.java
index 4cae298f18b35f73e3a64d5c8926bdc0f0402c4b..fee629dce62bc3978204f9b3a8e0aab72197ccfb 100644
--- a/src/main/java/org/bukkit/block/ChiseledBookshelf.java