Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a76998d Fix plugin loggers on shutdown (#5592)
This commit is contained in:
BillyGalbreath
2022-08-22 15:55:20 -05:00
parent e599e96628
commit 868748e16f
17 changed files with 64 additions and 64 deletions

View File

@@ -18,10 +18,10 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
this.gameTime = time % 192000; // Paper - fix guardian beam
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f810ed88c9d1d092308cfde748d0b18bc5f63a8b..b757c09223e2937a1fa06edd8e1bad63ed122620 100644
index b1098555ea7c96815dc85ab440544d9db7fee978..eb12fed7ee6d7d3a5f5b9e99d8f11b38122cac7e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1530,7 +1530,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1531,7 +1531,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
long worldTime = world.getGameTime();
final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
for (Player entityhuman : world.players()) {
@@ -31,7 +31,7 @@ index f810ed88c9d1d092308cfde748d0b18bc5f63a8b..b757c09223e2937a1fa06edd8e1bad63
}
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 28fd992a8ddc2089f7a7e87e14ef271d453ac4bb..38fe99c7b8db25933081d741553ded03722c177f 100644
index 5b6e2fcf0f8fc854c08dcdf40bdae91fd8d405f5..64edb1e92e9203f4e0a691adc69bdbbe8ec36607 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -211,6 +211,8 @@ public class ServerLevel extends Level implements WorldGenLevel {