mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes:c40e04e9e7Remove wrong update call in distance map add method58c41d0f60[ci skip] Update log4j-api in Paper-API to 2.17.1 (#7227)fa438331e0[ci skip] Update shadow and remove semicolons from kotlin code8b1734123eFix vanilla LocalMobCapCalculator being used when per-player mob spawning is enabled (#7230)3a43821c38Updated Upstream (Bukkit/CraftBukkit/Spigot)4bf2aef745Validate usernames3c5284dae9Allow . in usernames
This commit is contained in:
@@ -5,12 +5,12 @@ Subject: [PATCH] ItemStack convenience methods
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
||||
index f24820f14d689d49dfea25605199d5299ec28e7c..4e4fcce337047da575a9318c7094614d5270040e 100644
|
||||
index 56e5ab93096801277ec5162981ddf5275d2c7669..bfcd5b17898ae97340d813bb46506234bc03e229 100644
|
||||
--- a/src/main/java/org/bukkit/Material.java
|
||||
+++ b/src/main/java/org/bukkit/Material.java
|
||||
@@ -9832,4 +9832,40 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
// </editor-fold>
|
||||
}
|
||||
@@ -9857,4 +9857,40 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
|
||||
return Bukkit.getUnsafe().getDefaultAttributeModifiers(this, slot);
|
||||
}
|
||||
+
|
||||
+ // Purpur start
|
||||
|
||||
Reference in New Issue
Block a user