mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
9a15789561
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172) PaperMC/Paper@5deafd1 Teleportation API (#6562)
38 lines
2.7 KiB
Diff
38 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 11 Jun 2022 08:18:40 -0500
|
|
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 d1f238e2803ab080b7db1d01b399939e8c134c73..f15d956c727c9d356f1d616aee34121690944807 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2254,7 +2254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
|
}); // Paper - push to main
|
|
return false;
|
|
} else {
|
|
- if (this.isChatExpired(instant)) {
|
|
+ if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSentExpiredChat && this.isChatExpired(instant)) { // Purpur
|
|
ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), s, instant.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
|
|
index 8caf0861433263086dbae6f13b5fa6a36de68843..d0b4ea0212b6a5ccba029c124be1ca3ffafd5d26 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
@@ -431,11 +431,13 @@ public class PurpurConfig {
|
|
public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
|
|
public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
|
|
public static boolean loggerSuppressSetBlockFarChunk = false;
|
|
+ public static boolean loggerSuppressSentExpiredChat = false;
|
|
private static void loggerSettings() {
|
|
loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
|
|
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
|
|
loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
|
|
loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
|
|
+ loggerSuppressSentExpiredChat = getBoolean("settings.logger.suppress-sent-expired-chat", loggerSuppressSentExpiredChat);
|
|
}
|
|
|
|
public static boolean tpsCatchup = true;
|