Updated Upstream ()

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions

View File

@@ -5,16 +5,16 @@ Subject: [PATCH] Add log suppression for sent expired chat
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 042434dd91c32f0d89274c3d8eaae267c262e203..32c0c403f44ccfe215a0003c060b131edae72a7c 100644
index f4d769b3fc2e514308c14805d9cfb297b7b3f912..0d0f45160cb5e65ea6b3a8eae953935b45863ec8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2692,7 +2692,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
- if (playerchatmessage.hasExpiredServer(Instant.now())) {
+ if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSentExpiredChat && playerchatmessage.hasExpiredServer(Instant.now())) { // Purpur
ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), playerchatmessage.signedContent().plain(), playerchatmessage.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
- if (message.hasExpiredServer(Instant.now())) {
+ if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSentExpiredChat && message.hasExpiredServer(Instant.now())) { // Purpur
ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), message.signedContent().plain(), message.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java