mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-06-29 07:54:48 +02:00
25ecd402f3
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: 1a807731 #3567: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 772ad995 #3566: Bump actions/setup-java from 3 to 4 2431c40a #3562: Bump io.netty:netty-bom from 4.1.100.Final to 4.1.101.Final 8144ae8d #3555: Bump com.mysql:mysql-connector-j from 8.1.0 to 8.2.0 0757c39a Attempt upgrade of resolver libraries
69 lines
3.0 KiB
Diff
69 lines
3.0 KiB
Diff
From 1f305141c3b140348228142d4d450900021a083b Mon Sep 17 00:00:00 2001
|
|
From: phenomax <phenomax@revayd.net>
|
|
Date: Thu, 10 Aug 2017 18:41:17 +0200
|
|
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
|
|
|
|
|
|
diff --git a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
|
|
index 4c09efff..46517e03 100644
|
|
--- a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
|
|
+++ b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
|
|
@@ -8,6 +8,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
|
|
import net.md_5.bungee.api.chat.TextComponent;
|
|
import net.md_5.bungee.api.connection.PendingConnection;
|
|
import net.md_5.bungee.api.plugin.Cancellable;
|
|
+import net.md_5.bungee.connection.LoginResult; // Waterfall: Parse LoginResult object to new constructor of LoginEvent
|
|
|
|
/**
|
|
* Event called to represent a player logging in.
|
|
@@ -26,6 +27,13 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
|
|
* Message to use when kicking if this event is canceled.
|
|
*/
|
|
private BaseComponent reason;
|
|
+ // Waterfall start - adding the LoginResult variable to provide access to it, when calling the login event
|
|
+ /**
|
|
+ * The player's login result containing his textures
|
|
+ */
|
|
+ private LoginResult loginResult;
|
|
+ // Waterfall end
|
|
+
|
|
/**
|
|
* Connection attempting to login.
|
|
*/
|
|
@@ -37,6 +45,15 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
|
|
this.connection = connection;
|
|
}
|
|
|
|
+ // Waterfall start - adding new constructor for LoginResult
|
|
+ public LoginEvent(PendingConnection connection, Callback<LoginEvent> done, LoginResult loginResult)
|
|
+ {
|
|
+ super( done );
|
|
+ this.connection = connection;
|
|
+ this.loginResult = loginResult;
|
|
+ }
|
|
+ // Waterfall end
|
|
+
|
|
/**
|
|
* @return reason to be displayed
|
|
* @deprecated use component methods instead
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/api/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
|
similarity index 100%
|
|
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
|
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
|
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 7b02226f..bc98b6b1 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
|
|
@@ -612,7 +612,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
};
|
|
|
|
// fire login event
|
|
- bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, complete ) );
|
|
+ bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, complete, this.getLoginProfile() ) ); // Waterfall: Parse LoginResult object to new constructor of LoginEvent
|
|
}
|
|
|
|
private void finish2()
|
|
--
|
|
2.43.0
|
|
|