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:
75a0ee4f SPIGOT-6691: Material.LAVA_CAULDRON is not Levelled

CraftBukkit Changes:
e1c96e50 SPIGOT-6682: Blocking with shield not reset after die
97f629b6 SPIGOT-6220: Structures in the world with custom generator not work
85379258 Increase outdated build delay
f7f8dce4 SPIGOT-6552: Some inventory types reset cursor on switch
This commit is contained in:
Shane Freeder 2021-08-04 16:26:56 +01:00
parent d239eca9dd
commit f521a18a17
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
22 changed files with 59 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/api/0155-Material-API-additions.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index da9f91d0a1d20839cfbc4e564f4987cda440f2ac..52290c43d1c02785c4cae4a73494a75cdc369e02 100644
index e12e319bb16e8462614dc693c859e6d33ef87f28..e7af2b346253cf05923998527bdc27b1180fa3b6 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -99,6 +99,7 @@ import org.jetbrains.annotations.Nullable;
@ -16,7 +16,7 @@ index da9f91d0a1d20839cfbc4e564f4987cda440f2ac..52290c43d1c02785c4cae4a73494a75c
public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed">
AIR(9648, 0),
@@ -3977,6 +3978,22 @@ public enum Material implements Keyed {
@@ -3974,6 +3975,22 @@ public enum Material implements Keyed {
}
}