feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Guard against any potential modifications for UUID changes

Browse Source 
Related #344
This commit is contained in:
games647
2020-05-15 14:49:49 +02:00
parent 42637813e8
commit 0ad3a853b5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
View File

@ -68,10 +68,10 @@ public class ConnectListener implements Listener {
//use the login event instead of the post login event in order to send the login success packet to the client //use the login event instead of the post login event in order to send the login success packet to the client
//with the offline uuid this makes it possible to set the skin then //with the offline uuid this makes it possible to set the skin then
PendingConnection connection = loginEvent.getConnection(); final PendingConnection connection = loginEvent.getConnection();
InitialHandler initialHandler = (InitialHandler) connection; InitialHandler initialHandler = (InitialHandler) connection;
String username = initialHandler.getLoginRequest().getData(); final String username = initialHandler.getLoginRequest().getData();
if (connection.isOnlineMode()) { if (connection.isOnlineMode()) {
LoginSession session = plugin.getSession().get(connection); LoginSession session = plugin.getSession().get(connection);
session.setUuid(connection.getUniqueId()); session.setUuid(connection.getUniqueId());
@ -82,8 +82,8 @@ public class ConnectListener implements Listener {
//bungeecord will do this automatically so override it on disabled option //bungeecord will do this automatically so override it on disabled option
if (!plugin.getCore().getConfig().get("premiumUuid", true)) { if (!plugin.getCore().getConfig().get("premiumUuid", true)) {
try { try {
UUID oldPremiumId = connection.getUniqueId(); final UUID oldPremiumId = connection.getUniqueId();
UUID offlineUUID = UUIDAdapter.generateOfflineId(username); final UUID offlineUUID = UUIDAdapter.generateOfflineId(username);
// BungeeCord only allows setting the UUID in PreLogin events and before requesting online mode // BungeeCord only allows setting the UUID in PreLogin events and before requesting online mode
// However if online mode is requested, it will override previous values // However if online mode is requested, it will override previous values
@ -92,7 +92,8 @@ public class ConnectListener implements Listener {
idField.setAccessible(true); idField.setAccessible(true);
idField.set(connection, offlineUUID); idField.set(connection, offlineUUID);
plugin.getLog().info("Overriding UUID to {} from {} on {}", offlineUUID, oldPremiumId, connection); final String format = "Overriding UUID from {} to {} (based of {}) on {}";
plugin.getLog().info(format, oldPremiumId, offlineUUID, username, connection);
} catch (NoSuchFieldException | IllegalAccessException ex) { } catch (NoSuchFieldException | IllegalAccessException ex) {
plugin.getLog().error("Failed to set offline uuid of {}", username, ex); plugin.getLog().error("Failed to set offline uuid of {}", username, ex);
} }