Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e16fefb [ci skip] add 'accepted' to Done project category (#9429)
PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428)
PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518)
PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448)
This commit is contained in:
granny
2023-07-05 20:32:26 -07:00
parent ab2f1c06ce
commit b21daa9622
105 changed files with 679 additions and 695 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 a2b85017236f95b97d5d8017b0ff52db7537f090..303d08e0756525d25c450ae6e2a6083e4e5aa600 100644
index 80c085498d9b61bae2e06df873c1ad66cc7d8ae5..59da6baab74e0a40e93fa02ce4ce274524af9765 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index a2b85017236f95b97d5d8017b0ff52db7537f090..303d08e0756525d25c450ae6e2a6083e
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 667262ec2a7b53a87e31505e58eff92510ab590b..7a93de58b47aa8df950febc1a17dd871da0286bc 100644
index 8a98fab3e5052eb170653b869479a15f46643a20..8976113602277a64cd0049980701b6b7cbcc6b47 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3089,5 +3089,10 @@ public final class CraftServer implements Server {
@@ -3103,5 +3103,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}