TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-31 19:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use InboundConnection as session keys for Velocity

Browse Source 
Related #1286
This commit is contained in:
TuxCoding
2025-04-23 12:22:10 +02:00
parent 083068b856
commit 46239c9ffc
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/github/games647/fastlogin/core/scheduler/AsyncScheduler.java
View File

@@ -42,7 +42,8 @@ public class AsyncScheduler extends AbstractAsyncScheduler {
public AsyncScheduler(Logger logger, Executor processingPool) {
super(logger, processingPool);
logger.info("Using legacy platform scheduler for using an older Java version");
logger.info("Using legacy platform scheduler for using an older Java version. "
+ "Upgrade Java to 21+ for improved performance");
}
@Override

6
velocity/src/main/java/com/github/games647/fastlogin/velocity/FastLoginVelocity.java
View File

@@ -46,6 +46,7 @@ import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.InboundConnection;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
@@ -57,7 +58,6 @@ import org.geysermc.geyser.GeyserImpl;
import org.slf4j.Logger;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -75,7 +75,7 @@ public class FastLoginVelocity implements PlatformPlugin<CommandSource> {
private final ProxyServer server;
private final Path dataDirectory;
private final Logger logger;
private final ConcurrentMap<InetSocketAddress, VelocityLoginSession> session = new MapMaker().weakKeys().makeMap();
private final ConcurrentMap<InboundConnection, VelocityLoginSession> session = new MapMaker().weakKeys().makeMap();
private static final String PROXY_ID_FILE = "proxyId.txt";
private FastLoginCore<Player, CommandSource, FastLoginVelocity> core;
@@ -175,7 +175,7 @@ public class FastLoginVelocity implements PlatformPlugin<CommandSource> {
return core;
}
public ConcurrentMap<InetSocketAddress, VelocityLoginSession> getSession() {
public ConcurrentMap<InboundConnection, VelocityLoginSession> getSession() {
return session;
}

4
velocity/src/main/java/com/github/games647/fastlogin/velocity/VelocityLoginSource.java
View File

@@ -66,4 +66,8 @@ public class VelocityLoginSource implements LoginSource {
public InetSocketAddress getAddress() {
return connection.getRemoteAddress();
}
public InboundConnection getConnection() {
return connection;
}
}

8
velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/ConnectListener.java
View File

@@ -119,9 +119,9 @@ public class ConnectListener {
@Subscribe
public void onGameProfileRequest(GameProfileRequestEvent event) {
if (event.isOnlineMode()) {
LoginSession session = plugin.getSession().get(event.getConnection().getRemoteAddress());
LoginSession session = plugin.getSession().get(event.getConnection());
if (session == null) {
plugin.getLog().warn("No active login session found for player {}", event.getUsername());
plugin.getLog().error("No active login session found for onlinemode player {}", event.getUsername());
return;
}
@@ -173,7 +173,7 @@ public class ConnectListener {
}
}
VelocityLoginSession session = plugin.getSession().get(player.getRemoteAddress());
VelocityLoginSession session = plugin.getSession().get(player);
if (session == null) {
plugin.getLog().info("No active login session found on server connect for {}", player);
return;
@@ -192,6 +192,8 @@ public class ConnectListener {
public void onDisconnect(DisconnectEvent disconnectEvent) {
Player player = disconnectEvent.getPlayer();
plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
plugin.getSession().remove(player);
}
/**

2
velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java
View File

@@ -127,7 +127,7 @@ public class PluginMessageListener {
if (shouldPersist) {
//bukkit module successfully received and force logged in the user
//update only on success to prevent corrupt data
VelocityLoginSession loginSession = plugin.getSession().get(forPlayer.getRemoteAddress());
VelocityLoginSession loginSession = plugin.getSession().get(forPlayer);
StoredProfile playerProfile = loginSession.getProfile();
loginSession.setRegistered(true);
if (!loginSession.isAlreadySaved()) {

6
velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncPremiumCheck.java
View File

@@ -58,7 +58,7 @@ public class AsyncPremiumCheck extends JoinManagement<Player, CommandSource, Vel
@Override
public void run() {
plugin.getSession().remove(connection.getRemoteAddress());
plugin.getSession().remove(connection);
super.onLogin(username, new VelocityLoginSource(connection, preLoginEvent));
}
@@ -82,7 +82,7 @@ public class AsyncPremiumCheck extends JoinManagement<Player, CommandSource, Vel
String username, boolean registered) {
source.enableOnlinemode();
VelocityLoginSession session = new VelocityLoginSession(username, registered, profile);
plugin.getSession().put(source.getAddress(), session);
plugin.getSession().put(source.getConnection(), session);
String ip = source.getAddress().getAddress().getHostAddress();
plugin.getCore().addLoginAttempt(ip, username);
@@ -91,6 +91,6 @@ public class AsyncPremiumCheck extends JoinManagement<Player, CommandSource, Vel
@Override
public void startCrackedSession(VelocityLoginSource source, StoredProfile profile, String username) {
VelocityLoginSession session = new VelocityLoginSession(username, false, profile);
plugin.getSession().put(source.getAddress(), session);
plugin.getSession().put(source.getConnection(), session);
}
}

2
velocity/src/main/java/com/github/games647/fastlogin/velocity/task/FloodgateAuthTask.java
View File

@@ -52,7 +52,7 @@ public class FloodgateAuthTask
@Override
protected void startLogin() {
VelocityLoginSession session = new VelocityLoginSession(player.getUsername(), isRegistered, profile);
core.getPlugin().getSession().put(player.getRemoteAddress(), session);
core.getPlugin().getSession().put(player, session);
// enable auto login based on the value of 'autoLoginFloodgate' in config.yml
boolean forcedOnlineMode = autoLoginFloodgate.equals("true")