twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-27 18:33:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

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 e71930939e
commit 239e16a2be
7 changed files with 14 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/api/Mark-experimental-api-as-such.patch
View File

@@ -972,6 +972,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/Biome.java
+++ b/src/main/java/org/bukkit/block/Biome.java
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/ChiseledBookshelf.java