From 66a51a8e133d920e402ef9e27628625734e38527 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:31:39 +0200
Subject: [PATCH] Remove unused 'serverId' from BukkitLoginSession

---
 .../games647/fastlogin/bukkit/BukkitLoginSession.java  | 10 ++++------
 .../bukkit/listener/protocollib/NameCheckTask.java     |  3 +--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java
index 95c317a3..68008246 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java
@@ -40,34 +40,32 @@ public class BukkitLoginSession extends LoginSession {
 
     private static final byte[] EMPTY_ARRAY = {};
 
-    private final String serverId;
     private final byte[] verifyToken;
 
     private boolean verified;
 
     private SkinProperty skinProperty;
 
-    public BukkitLoginSession(String username, String serverId, byte[] verifyToken, boolean registered
+    public BukkitLoginSession(String username, byte[] verifyToken, boolean registered
             , StoredProfile profile) {
         super(username, registered, profile);
 
-        this.serverId = serverId;
         this.verifyToken = verifyToken.clone();
     }
 
     //available for BungeeCord
     public BukkitLoginSession(String username, boolean registered) {
-        this(username, "", EMPTY_ARRAY, registered, null);
+        this(username, EMPTY_ARRAY, registered, null);
     }
 
     //cracked player
     public BukkitLoginSession(String username, StoredProfile profile) {
-        this(username, "", EMPTY_ARRAY, false, profile);
+        this(username, EMPTY_ARRAY, false, profile);
     }
 
     //ProtocolSupport
     public BukkitLoginSession(String username, boolean registered, StoredProfile profile) {
-        this(username, "", EMPTY_ARRAY, registered, profile);
+        this(username, EMPTY_ARRAY, registered, profile);
     }
 
     /**
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
index ee6ba69b..ddfb29d3 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
@@ -104,10 +104,9 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         String ip = player.getAddress().getAddress().getHostAddress();
         core.getPendingLogin().put(ip + username, new Object());
 
-        String serverId = source.getServerId();
         byte[] verify = source.getVerifyToken();
 
-        BukkitLoginSession playerSession = new BukkitLoginSession(username, serverId, verify, registered, profile);
+        BukkitLoginSession playerSession = new BukkitLoginSession(username, verify, registered, profile);
         plugin.putSession(player.getAddress(), playerSession);
         //cancel only if the player has a paid account otherwise login as normal offline player
         synchronized (packetEvent.getAsyncMarker().getProcessingLock()) {