Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7f1a154 Add validation to player profile and properties (#10680)
PaperMC/Paper@4fd58a1 Add conversion for summon command
PaperMC/Paper@39532a1 Fix stacks losing empty attr modifiers
PaperMC/Paper@cdb6ba8 Fix keepalive time interval (#10690)
This commit is contained in:
granny
2024-05-10 19:06:49 -07:00
parent e1603ae33f
commit 479a7d8583
6 changed files with 13 additions and 13 deletions

View File

@@ -24,10 +24,10 @@ index 54f11593f4acfb89623cf1fad58819e001505fd1..215647d7f5cc8487d6a173bc0160fec6
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54..7f9dc209c88a66bd2ee82cc62b948e827c6b1060 100644
index 9ca26866e902aa6b70f9878bb16cdc558f9138f7..f6d1d39a3988aee95176badf47c127c82d3aa207 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2560,5 +2560,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2562,5 +2562,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();