mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-01-08 08:57:39 +01:00
d6688e05e6
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: 511017ab #3396: Update Netty version c3e8cfac #3374, #3389: Improve log handling of normal java.util Logger usage by forwarding the LogRecords directly to the BungeeLogger instead of the fallback err stream. bf2b3c68 #3384: Update documentation of ProxyPingEvent 68e74a8c #3378: Remove KickStringWriter from the pipeline after handshake arrives 5b4a5404 #3361: Cache MessageFormats for translations 88da5c05 #3353: Update GitHub actions
37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
From 0e1d3e227cfd6fead7f0c0377fb2807efb98b515 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 e8ceddf7..c1fbf84c 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
|
|
@@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
|
|
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() )
|
|
{
|
|
+ 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.38.1
|
|
|