R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned unused feilds

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-07-10 01:13:10 +02:00
parent 003253456c
commit 69ae2401af
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeHandler.java
View File

@ -32,7 +32,6 @@ public class ForgeHandshakeHandler {
forgeServerConnectionMap = new HashMap<>(); forgeServerConnectionMap = new HashMap<>();
private final Map<InetSocketAddress,ForgeConnection> incomingForgeConnections = new HashMap<>(); private final Map<InetSocketAddress,ForgeConnection> incomingForgeConnections = new HashMap<>();
private final List<Player> doomedConnections = new ArrayList<>();
private static final ChannelIdentifier LOGIN_WRAPPER_ID = MinecraftChannelIdentifier.create("fml","loginwrapper"); private static final ChannelIdentifier LOGIN_WRAPPER_ID = MinecraftChannelIdentifier.create("fml","loginwrapper");
@ -59,7 +58,7 @@ public class ForgeHandshakeHandler {
//If a connection does not already exist, create one. //If a connection does not already exist, create one.
if (!forgeServerConnectionMap.containsKey(defaultServer)) { if (!forgeServerConnectionMap.containsKey(defaultServer)) {
forgeServerConnectionMap.put(defaultServer, new ForgeServerConnection(defaultServer,logger)); forgeServerConnectionMap.put(defaultServer, new ForgeServerConnection(defaultServer));
} }
ForgeServerConnection forgeServerConnection = forgeServerConnectionMap.get(defaultServer); ForgeServerConnection forgeServerConnection = forgeServerConnectionMap.get(defaultServer);
@ -102,7 +101,7 @@ public class ForgeHandshakeHandler {
//Check 2 //Check 2
if (getForgeServerConnection(event.getConnection().getServer()).isEmpty()) { if (getForgeServerConnection(event.getConnection().getServer()).isEmpty()) {
registerForgeServer(event.getConnection().getServer(), registerForgeServer(event.getConnection().getServer(),
new ForgeServerConnection(event.getConnection().getServer(), logger)); new ForgeServerConnection(event.getConnection().getServer()));
} }
if (incomingForgeConnections.containsKey(event.getConnection().getPlayer().getRemoteAddress())) { if (incomingForgeConnections.containsKey(event.getConnection().getPlayer().getRemoteAddress())) {

4
src/main/java/org/adde0109/ambassador/forge/ForgeServerConnection.java
View File

@ -8,7 +8,6 @@ import org.slf4j.Logger;
public class ForgeServerConnection { public class ForgeServerConnection {
private static final int PACKET_LENGTH_INDEX = 14; //length of "fml:handshake"+1 private static final int PACKET_LENGTH_INDEX = 14; //length of "fml:handshake"+1
private final Logger logger;
private final RegisteredServer handshakeServer; private final RegisteredServer handshakeServer;
private ForgeHandshakeUtils.CachedServerHandshake handshake; private ForgeHandshakeUtils.CachedServerHandshake handshake;
@ -16,9 +15,8 @@ public class ForgeServerConnection {
return handshakeServer; return handshakeServer;
} }
public ForgeServerConnection(RegisteredServer handshakeServer, Logger logger) { public ForgeServerConnection(RegisteredServer handshakeServer) {
this.handshakeServer = handshakeServer; this.handshakeServer = handshakeServer;
this.logger = logger;
} }
public CompletableFuture<ForgeHandshakeUtils.CachedServerHandshake> getHandshake() { public CompletableFuture<ForgeHandshakeUtils.CachedServerHandshake> getHandshake() {