mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-10-15 14:55:19 +02:00
8075dbe95d
Upstream has released updates that appears 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: e93c762f #2921: ClickEvent without value exceptions in window title 023f407b #2928: Add IPOther special plugin message 64e4f465 #2931: Fix exceptions on ChatColor.of(Color) due to truncation
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
From 18de08eb94180ea4cd7742e326b366b08a753774 Mon Sep 17 00:00:00 2001
|
|
From: theminecoder <theminecoder.dev@gmail.com>
|
|
Date: Sun, 19 Jul 2020 10:18:23 +1000
|
|
Subject: [PATCH] Add auth url option
|
|
|
|
|
|
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 b848e451..4b40b465 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
|
|
@@ -70,6 +70,8 @@ import net.md_5.bungee.util.QuietException;
|
|
public class InitialHandler extends PacketHandler implements PendingConnection
|
|
{
|
|
|
|
+ private static final String MOJANG_AUTH_URL = System.getProperty("waterfall.auth.url", "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=%s&serverId=%s%s");
|
|
+
|
|
private final BungeeCord bungee;
|
|
private ChannelWrapper ch;
|
|
@Getter
|
|
@@ -442,7 +444,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
|
|
|
|
String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
|
|
- String authURL = "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=" + encName + "&serverId=" + encodedHash + preventProxy;
|
|
+ String authURL = String.format( MOJANG_AUTH_URL, encName, encodedHash, preventProxy );
|
|
|
|
Callback<String> handler = new Callback<String>()
|
|
{
|
|
--
|
|
2.28.0
|
|
|