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

@@ -25,10 +25,10 @@ index 5d1b55fdbcbe63f6b42b694d05211a3cc691a09d..54f11593f4acfb89623cf1fad58819e0
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f5c3c1a0c11dd3518981ce3b86dba8ced8578d9c..1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54 100644
index 607ba7cb902d7053cb570d8f3676ecbadbe56daf..9ca26866e902aa6b70f9878bb16cdc558f9138f7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2552,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2554,4 +2554,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API