Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a05e69b Add a bit of extra debugging to chat order/time errors
This commit is contained in:
BillyGalbreath
2022-07-06 07:42:21 -05:00
parent 86dfa7f275
commit 52b42b7fd8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = c879064bfeaac42e1baed0e48973664a8ad75f37
paperCommit = a05e69b9fc043dca907f2ed26cc8aa462d830f25
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch
View File

@@ -5,7 +5,7 @@ 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 05bda808496f38d10416c3702b1f97fe18247769..99c8b4957194868c36f9ea214c7f77a23ce8002a 100644
index 5868d67e0bc5a8f75b6719d727abac6f83a1513a..35b7e40810dce7fcde0e750df8ab8b6f8285c4e3 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2248,7 +2248,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -14,11 +14,11 @@ index 05bda808496f38d10416c3702b1f97fe18247769..99c8b4957194868c36f9ea214c7f77a2
} 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?", this.player.getName().getString(), s);
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 3d96a49cca34f0a3f3b37de839e476c2a4c1f1d6..fecfe935e09ff52a6ec582e6f2e09611adb1106f 100644
index fecbd06816b3bd171a0a268bcda0cb545a893b1e..22b744c0b047e1fa071e08f7a030199b4d7544f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -417,11 +417,13 @@ public class PurpurConfig {