Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a9201d4 [ci skip] Move logic in our patches to ItemType/BlockType (#10772)
PaperMC/Paper@3de408e Fix equipment slot and group API (#10767)
PaperMC/Paper@d408381 Print CommandRegisteredEvent deprecation warnings again (#10756)
PaperMC/Paper@6de7a1f Improve default item attributes API (#10765)
PaperMC/Paper@2a90732 Remove incorrect logic for Fireball#setVelocity (#10764)
PaperMC/Paper@5e7b65a Allow using PluginLoader classpath API from Bukkit plugins (#10758)
This commit is contained in:
granny
2024-05-23 15:12:39 -07:00
parent ed1e0ec889
commit 1bbb033479
4 changed files with 8 additions and 8 deletions

View File

@@ -252,10 +252,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 5a382907285a288f2a223189e690d3dbdf45594c..3daf674f1e0de3fdd89db5536cc1e34140a5abb8 100644
index e46714f38df931350d81c30907560c381c8d2725..777f1d11d9fb5af29ec895383902daf348eb528e 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -511,7 +511,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -502,7 +502,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {