mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-21 07:49:22 +00:00
44 lines
2.3 KiB
Diff
44 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Mon, 26 Dec 2022 05:22:43 +0100
|
|
Subject: [PATCH] Make chat order verification configurable
|
|
|
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Add option to disable out-of-order chat"
|
|
By: Kevin Raneri <kevin.raneri@gmail.com>
|
|
As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
|
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 376f277863a8e7a2f31ec6b013425e11bc719571..cacf0de71e3a84a18213628764c2a7b4c0a43781 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2425,6 +2425,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
}
|
|
|
|
private boolean updateChatOrder(Instant timestamp) {
|
|
+ // Gale start - Pufferfish - make chat order verification configurable
|
|
+ if (!GaleGlobalConfiguration.get().misc.verifyChatOrder) {
|
|
+ return true;
|
|
+ }
|
|
+ // Gale end - Pufferfish - make chat order verification configurable
|
|
Instant instant1;
|
|
|
|
do {
|
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
|
index 346fdf6f8a76539fa9ca46015ee122417e4a8102..7c781eabbb6df5df9f9f2cbdeef4e116ca30b645 100644
|
|
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
|
@@ -45,6 +45,8 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
|
public Misc misc;
|
|
public class Misc extends ConfigurationPart {
|
|
|
|
+ public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
|
|
+
|
|
public IncludeInTimingsReport includeInTimingsReport;
|
|
public class IncludeInTimingsReport extends ConfigurationPart {
|
|
|