PaperMC/patches/server/0784-Do-not-accept-invalid-client-settings.patch

25 lines
1.6 KiB
Diff
Raw Normal View History

2022-05-07 23:59:20 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 7 May 2022 14:58:53 -0700
Subject: [PATCH] Do not accept invalid client settings
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 4500a638c48c224dc38e0cfbc2f04e8bea0277ed..2a603cd36fc98d9c80a6c7d9ea2be51cde369297 100644
2022-05-07 23:59:20 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3316,6 +3316,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2022-05-07 23:59:20 +02:00
@Override
public void handleClientInformation(ServerboundClientInformationPacket packet) {
2023-06-08 10:47:19 +02:00
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
2022-05-07 23:59:20 +02:00
+ // Paper start - do not accept invalid information
+ if (packet.information().viewDistance() < 0) {
+ LOGGER.warn("Disconnecting " + this.player.getScoreboardName() + " for invalid view distance: " + packet.information().viewDistance());
2023-09-22 19:31:02 +02:00
+ this.disconnect("Invalid client settings", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION);
2022-05-07 23:59:20 +02:00
+ return;
+ }
+ // Paper end - do not accept invalid information
this.player.updateOptions(packet.information());
2023-09-23 01:42:59 +02:00
this.connection.channel.attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).set(net.kyori.adventure.translation.Translator.parseLocale(packet.information().language())); // Paper
2022-05-07 23:59:20 +02:00
}