mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
60 lines
3.5 KiB
Diff
60 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
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..aa1c6de4d6cb7bbca33d25895c54707d220ab62a 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
|
|
+ RemoteChatSession.Data chatSession = entry.chatSession;
|
|
+ if (chatSession != null && chatSession.profilePublicKey().hasExpired()) {
|
|
+ chatSession = null;
|
|
+ }
|
|
+ buf.writeNullable(chatSession, RemoteChatSession.Data::write);
|
|
+ // Paper end
|
|
}),
|
|
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 869440f9413610bed007bbfc0983113b2555d5f6..df6aa82e8a556c65e8581ac3efd95d5dd8868331 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
private int knownMovePacketCount;
|
|
@Nullable
|
|
private RemoteChatSession chatSession;
|
|
+ private boolean hasLoggedExpiry = false; // Paper
|
|
private SignedMessageChain.Decoder signedMessageDecoder;
|
|
private final LastSeenMessagesValidator lastSeenMessages = new LastSeenMessagesValidator(20);
|
|
private final MessageSignatureCache messageSignatureCache = MessageSignatureCache.createDefault();
|
|
@@ -396,6 +397,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
|
|
+ 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
|
|
+
|
|
}
|
|
|
|
public void resetPosition() {
|
|
@@ -3416,6 +3424,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
|
|
private void resetPlayerChatState(RemoteChatSession session) {
|
|
this.chatSession = session;
|
|
+ this.hasLoggedExpiry = false; // Paper
|
|
this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
|
|
this.chatMessageChain.append(() -> {
|
|
this.player.setChatSession(session);
|