aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff options
context:
space:
mode:
authormaxcom1 <[email protected]>2024-03-23 22:26:17 +0100
committerGitHub <[email protected]>2024-03-23 17:26:17 -0400
commitb6001403e9703cadaa6e8c8558e732b91c3c6d6e (patch)
treea8c57bbc334a8ad48d4ad2b43db335667b142bee /patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch
parent9ec7dfcbc41c6e625de0050b6997160a75df9f44 (diff)
downloadPaper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.tar.gz
Paper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.zip
Add methods to change entity physics (#10334)
Diffstat (limited to 'patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch')
-rw-r--r--patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch
new file mode 100644
index 0000000000..3649dc015b
--- /dev/null
+++ b/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Mon, 3 Apr 2023 08:55:52 +0100
+Subject: [PATCH] Prevent causing expired keys from impacting new joins
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
+index 0e54e8faa48751a651b953bec72543a94edf74bc..d43106eb89b14667e85cd6e8fa047d64f2e8ec87 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
+@@ -96,7 +96,13 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet<ClientGamePacke
+ INITIALIZE_CHAT((serialized, buf) -> {
+ serialized.chatSession = buf.readNullable(RemoteChatSession.Data::read);
+ }, (buf, entry) -> {
+- buf.writeNullable(entry.chatSession, RemoteChatSession.Data::write);
++ // Paper start - Prevent causing expired keys from impacting new joins
++ RemoteChatSession.Data chatSession = entry.chatSession;
++ if (chatSession != null && chatSession.profilePublicKey().hasExpired()) {
++ chatSession = null;
++ }
++ buf.writeNullable(chatSession, RemoteChatSession.Data::write);
++ // Paper end - Prevent causing expired keys from impacting new joins
+ }),
+ UPDATE_GAME_MODE((serialized, buf) -> {
+ serialized.gameMode = GameType.byId(buf.readVarInt());
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index c9dab47fe3db73b31b40e071d37f1be63401c19d..69118af2a873f23f6543676db39263bfeb81b4f1 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -286,6 +286,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ private int knownMovePacketCount;
+ @Nullable
+ private RemoteChatSession chatSession;
++ private boolean hasLoggedExpiry = false; // Paper - Prevent causing expired keys from impacting new joins
+ private SignedMessageChain.Decoder signedMessageDecoder;
+ private final LastSeenMessagesValidator lastSeenMessages = new LastSeenMessagesValidator(20);
+ private final MessageSignatureCache messageSignatureCache = MessageSignatureCache.createDefault();
+@@ -394,6 +395,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
+ }
+
++ // Paper start - Prevent causing expired keys from impacting new joins
++ if (!hasLoggedExpiry && this.chatSession != null && this.chatSession.profilePublicKey().data().hasExpired()) {
++ LOGGER.info("Player profile key for {} has expired!", this.player.getName().getString());
++ hasLoggedExpiry = true;
++ }
++ // Paper end - Prevent causing expired keys from impacting new joins
++
+ }
+
+ public void resetPosition() {
+@@ -3337,6 +3345,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+
+ private void resetPlayerChatState(RemoteChatSession session) {
+ this.chatSession = session;
++ this.hasLoggedExpiry = false; // Paper - Prevent causing expired keys from impacting new joins
+ this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
+ this.chatMessageChain.append(() -> {
+ this.player.setChatSession(session);