Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
PaperMC/Paper@2eda177 Expand PlayerItemMendEvent (#7382)
PaperMC/Paper@bacbf86 Fixes and additions to projectile API (#9237)
PaperMC/Paper@8a18fc5 [ci skip] add 'needs triage' label to invalid on issue close (#9252)
PaperMC/Paper@d8d3bd7 [ci skip] Add missing deprecations for legacy MaterialData api (#9253)
This commit is contained in:
granny
2023-06-04 00:18:33 -07:00
parent d6cfa8f939
commit 6d7bb23341
37 changed files with 114 additions and 114 deletions

View File

@@ -25,10 +25,10 @@ index 57f6de7872bfa80cf7668524975946cbd7fcda56..6cdcd4f105b15f10d60499572f6f4f83
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7104df35cf3de47026ae339a5e5f0ca211c3b08c..553df241cde2fb53c9b061f3fc54136d4a67a633 100644
index c4c0cfa2530bab3d898603f2335ffe92460431b6..5805da6b1322d6be5067aeab91be90c02997f7c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2980,5 +2980,10 @@ public final class CraftServer implements Server {
@@ -2982,5 +2982,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}