9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-30 12:19:18 +00:00

Do not process chat/commands before player has joined

This commit is contained in:
MartijnMuijsers
2022-11-29 15:35:37 +01:00
parent 2054615d1d
commit 64638f417a
27 changed files with 31 additions and 5 deletions

View File

@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MartijnMuijsers <martijnmuijsers@live.nl>
Date: Tue, 29 Nov 2022 15:33:32 +0100
Subject: [PATCH] Do not process chat/commands before player has joined
License: MIT (https://opensource.org/licenses/MIT)
This patch is based on the following patch:
"Do not process chat/commands before player has joined"
By: chickeneer <emcchickeneer@gmail.com>
As part of: EmpireCraft (https://github.com/starlis/empirecraft)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d31a345edfffe39f127073fc3aec8b3489bae79c..68d07621c377d96f8a9c13b20a1c82358d98cf94 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2345,7 +2345,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
return false;
- } else {
+ } else if (!player.didPlayerJoinEvent) { return false; // Gale - EMC - do not process chat/commands before player has joined
LastSeenMessagesValidator lastseenmessagesvalidator = this.lastSeenMessagesValidator;
Set set;

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Do not log empty message warnings
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-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 d31a345edfffe39f127073fc3aec8b3489bae79c..426a7fd3df09aa34967ab7707959ea7e037381fb 100644
index 68d07621c377d96f8a9c13b20a1c82358d98cf94..563578d814ab4a589671e954909412c96196e2de 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -185,6 +185,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Do not log expired message warnings
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-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 426a7fd3df09aa34967ab7707959ea7e037381fb..497ff02924047f0d876ffca7aaa1ceb21084a8f7 100644
index 563578d814ab4a589671e954909412c96196e2de..ae68219457c0545ae72927f45fece411d39641c0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2610,7 +2610,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

View File

@@ -478,7 +478,7 @@ index e7505144eba068e687f1ce7617f09d838bceab85..023cd8d948ff7360ac8348b980473ef1
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 497ff02924047f0d876ffca7aaa1ceb21084a8f7..a1ee89845ec41063d0c7983b1f4adf86843aaadf 100644
index ae68219457c0545ae72927f45fece411d39641c0..7f88092235170465d4320e5f909288a6d26f206e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -28,6 +28,8 @@ import java.util.function.UnaryOperator;

View File

@@ -258,7 +258,7 @@ index 9720e5360beabe7e15b0b964cb3b81d5af2b4bf8..a30024ab934b81cd76e282fab4bbf605
return io.papermc.paper.util.TickThread.isTickThread(); // Paper - rewrite chunk system
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a1ee89845ec41063d0c7983b1f4adf86843aaadf..8a191bf52554adde15c618c41d5e399f04963dbe 100644
index 7f88092235170465d4320e5f909288a6d26f206e..a4a9065427cefbcfff5c220d108819fbe4c8c3ae 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -184,6 +184,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Remove tab complete executor
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-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 8a191bf52554adde15c618c41d5e399f04963dbe..3b5d5f6929e88fd9f6b67d81732f0cb587138369 100644
index a4a9065427cefbcfff5c220d108819fbe4c8c3ae..4983420eb15269c046bc473dfe12f76fecd6ed2c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -184,6 +184,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;