Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e574412 Replace ConfiguredStructure api with Structure (#8642)
PaperMC/Paper@a172880 Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime
PaperMC/Paper@4151f75 /paper entity list QOL improvements (#8876)
PaperMC/Paper@8a815a0 Fix rendering for translatable death messages (#8534)
PaperMC/Paper@d30cda1 Add TeleportFlags (#8855)
PaperMC/Paper@3dcf4e4 Add EntityFertilizeEggEvent (#8041)
PaperMC/Paper@f2075c4 Take in account waterlogged block for the event (#8623)
PaperMC/Paper@e5e75dd Include previous spawn angle in SpawnChangeEvent (#8606)
PaperMC/Paper@541753b Fix HumanEntity#drop not updating the client inventory (#6761)
This commit is contained in:
granny
2023-03-05 03:32:31 -08:00
parent 3940c828a6
commit ade1ed1d98
31 changed files with 108 additions and 108 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 70d3fc30e21a6c3c3d7a87ce2e43dd2eb8322b2c..7c731c72a19c43f4b291557310c632f3d1fcc9cb 100644
index 1940c348b236c195bb94e39c6deba972093c0c8f..3dd4ae421574453ffe346a12fd4f036bda335307 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -305,6 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index 70d3fc30e21a6c3c3d7a87ce2e43dd2eb8322b2c..7c731c72a19c43f4b291557310c632f3
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ca3bb446e7f4e1585b06f462ec6844956e2a0ee6..eb180b694198d31ae34eb451964f7f738db7ab81 100644
index 72d52c43947616dc81fbbd7926d2028be3ffcce4..30369316aebaa4078022a78ad66dc88abf3c904b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2948,5 +2948,10 @@ public final class CraftServer implements Server {
@@ -2947,5 +2947,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}