Skip to content

Commit 4c0797d

Browse files
committed
No longer treat linked Floodgate players as conflicting names
Since linked players inherit the name of the Java player, it'll always conflict a Java player 's name
1 parent 235d7f8 commit 4c0797d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@ public void run() {
7676
}
7777

7878
//decide if checks should be made for conflicting Java player names
79-
if (autoLoginFloodgate.equals("no-conflict")
80-
|| !isRegistered && autoRegisterFloodgate.equals("no-conflict")) {
79+
if (!isLinked &&
80+
(
81+
autoLoginFloodgate.equals("no-conflict")
82+
|| !isRegistered && autoRegisterFloodgate.equals("no-conflict"))
83+
) {
8184
// check for conflicting Premium Java name
8285
Optional<Profile> premiumUUID = Optional.empty();
8386
try {

0 commit comments

Comments
 (0)