mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-30 07:27:28 +02:00
be3a798a36
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: f5157f12 #3438: Fix possible race condition in duplicate player check df20effa #3557: Replace Guava Charsets with Java StandardCharsets
37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
From eca9314d27830f7af4300fca0330aee48324363b Mon Sep 17 00:00:00 2001
|
|
From: Aurora <aurora@relanet.eu>
|
|
Date: Mon, 18 Jul 2022 15:56:05 +0200
|
|
Subject: [PATCH] Add message for outdated clients that don't support secure
|
|
profiles
|
|
|
|
Clients before 1.19 don't support secure profiles, but since secure profiles is one of the first
|
|
things checked those outdated clients didn't get a useful message telling them to update.
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
index 9c322fb5..a9358a51 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
@@ -395,6 +395,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
|
|
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
|
|
{
|
|
+ if ( handshake.getProtocolVersion() < ProtocolConstants.MINECRAFT_1_19 ) {disconnect(bungee.getTranslation("secure_profile_unsupported"));} // Waterfall - Tell old clients to update if secure profiles are required
|
|
PlayerPublicKey publicKey = loginRequest.getPublicKey();
|
|
if ( publicKey == null )
|
|
{
|
|
diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties
|
|
index e42b798b..76ad621f 100644
|
|
--- a/proxy/src/main/resources/messages.properties
|
|
+++ b/proxy/src/main/resources/messages.properties
|
|
@@ -25,6 +25,7 @@ offline_mode_player=\u00a7cNot authenticated with Minecraft.net
|
|
secure_profile_required=\u00a7cA secure profile is required to join this server.
|
|
secure_profile_expired=\u00a7cSecure profile expired.
|
|
secure_profile_invalid=\u00a7cSecure profile invalid.
|
|
+secure_profile_unsupported=\u00a7cOutdated client, secure profile not supported. Please use 1.19 or newer.
|
|
message_needed=\u00a7cYou must supply a message.
|
|
error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
|
|
error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
|
|
--
|
|
2.42.1
|
|
|