Updated Upstream (Bukkit/CraftBukkit) (#10301)
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: 7ca2b46c SPIGOT-7594: Fix typo and include missing MinecraftExperimental annotation in Loot Table enum CraftBukkit Changes: 176c0ad39 Fix copying BlockStates with fields (eg, Banner) ee685bd2a Fix Camel not standing up when hurt 619936d4b Increase outdated build delay
This commit is contained in:
parent
0052e2db39
commit
a0931f4864
11 changed files with 49 additions and 45 deletions
|
@ -613,7 +613,7 @@ index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f
|
|||
|
||||
private static Structure getStructure(String name) {
|
||||
diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java
|
||||
index d87214444118f57dad31898cf776b9e4a368d11d..b3fcb501e69136df73943e1752df41a477111d59 100644
|
||||
index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8b46e80d9 100644
|
||||
--- a/src/main/java/org/bukkit/loot/LootTables.java
|
||||
+++ b/src/main/java/org/bukkit/loot/LootTables.java
|
||||
@@ -35,24 +35,34 @@ public enum LootTables implements Keyed {
|
||||
|
@ -651,3 +651,14 @@ index d87214444118f57dad31898cf776b9e4a368d11d..b3fcb501e69136df73943e1752df41a4
|
|||
TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"),
|
||||
SHIPWRECK_MAP("chests/shipwreck_map"),
|
||||
SHIPWRECK_SUPPLY("chests/shipwreck_supply"),
|
||||
@@ -180,8 +190,10 @@ public enum LootTables implements Keyed {
|
||||
PIGLIN_BARTERING("gameplay/piglin_bartering"),
|
||||
// Spawners
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBER_KEY("spawners/trial_chamber/key"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"),
|
||||
// Archaeology
|
||||
DESERT_WELL_ARCHAEOLOGY("archaeology/desert_well"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue