Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
This commit is contained in:
BillyGalbreath
2022-02-18 20:06:35 -06:00
parent d0ea018612
commit 5ad7f4bd90
36 changed files with 101 additions and 99 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 0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a..0c7355902448b444c360259a84a7e8a10ad96f46 100644
index c386c146362138dbf8f397101ad91b3da6b72883..04439c7a4dcc45ae57aca2e090064a74e4230e95 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index 0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a..0c7355902448b444c360259a84a7e8a1
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a5c64896d5d87a04773ec578034c5df4febd4914..805250ab22b07918ad553869ab4391e7fa953e7e 100644
index e8ff8dea26eb464804b950a4e9af74451e33ed17..136f93f18414a7968ca85d134218ebaa3cb5e03b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2863,5 +2863,10 @@ public final class CraftServer implements Server {
@@ -2876,5 +2876,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}