mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-10-01 16:07:38 +02:00
097888c72a
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: 78ca16df Minecraft 1.19.1 support adc32d5a #3367: Add linux aarch64 native epoll support 12e45148 #3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
From 31819af9137d9e22392d3dee782a26d690651644 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 5331518b..5ee47b6a 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
|
|
@@ -76,6 +76,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
|
|
@@ -498,7 +500,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.37.1
|
|
|