Skip to content

Commit 66a51a8

Browse files
committed
Remove unused 'serverId' from BukkitLoginSession
1 parent d1109ac commit 66a51a8

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,32 @@ public class BukkitLoginSession extends LoginSession {
4040

4141
private static final byte[] EMPTY_ARRAY = {};
4242

43-
private final String serverId;
4443
private final byte[] verifyToken;
4544

4645
private boolean verified;
4746

4847
private SkinProperty skinProperty;
4948

50-
public BukkitLoginSession(String username, String serverId, byte[] verifyToken, boolean registered
49+
public BukkitLoginSession(String username, byte[] verifyToken, boolean registered
5150
, StoredProfile profile) {
5251
super(username, registered, profile);
5352

54-
this.serverId = serverId;
5553
this.verifyToken = verifyToken.clone();
5654
}
5755

5856
//available for BungeeCord
5957
public BukkitLoginSession(String username, boolean registered) {
60-
this(username, "", EMPTY_ARRAY, registered, null);
58+
this(username, EMPTY_ARRAY, registered, null);
6159
}
6260

6361
//cracked player
6462
public BukkitLoginSession(String username, StoredProfile profile) {
65-
this(username, "", EMPTY_ARRAY, false, profile);
63+
this(username, EMPTY_ARRAY, false, profile);
6664
}
6765

6866
//ProtocolSupport
6967
public BukkitLoginSession(String username, boolean registered, StoredProfile profile) {
70-
this(username, "", EMPTY_ARRAY, registered, profile);
68+
this(username, EMPTY_ARRAY, registered, profile);
7169
}
7270

7371
/**

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,9 @@ public void requestPremiumLogin(ProtocolLibLoginSource source, StoredProfile pro
104104
String ip = player.getAddress().getAddress().getHostAddress();
105105
core.getPendingLogin().put(ip + username, new Object());
106106

107-
String serverId = source.getServerId();
108107
byte[] verify = source.getVerifyToken();
109108

110-
BukkitLoginSession playerSession = new BukkitLoginSession(username, serverId, verify, registered, profile);
109+
BukkitLoginSession playerSession = new BukkitLoginSession(username, verify, registered, profile);
111110
plugin.putSession(player.getAddress(), playerSession);
112111
//cancel only if the player has a paid account otherwise login as normal offline player
113112
synchronized (packetEvent.getAsyncMarker().getProcessingLock()) {

0 commit comments

Comments
 (0)