From 4c0797d5eae21dfcd56c54d7b82869be129b1354 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sat, 22 May 2021 18:23:43 +0200 Subject: [PATCH] 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 --- .../games647/fastlogin/bukkit/task/FloodgateAuthTask.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java index acc8d8a8..2592b064 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java @@ -76,8 +76,11 @@ public class FloodgateAuthTask implements Runnable { } //decide if checks should be made for conflicting Java player names - if (autoLoginFloodgate.equals("no-conflict") - || !isRegistered && autoRegisterFloodgate.equals("no-conflict")) { + if (!isLinked && + ( + autoLoginFloodgate.equals("no-conflict") + || !isRegistered && autoRegisterFloodgate.equals("no-conflict")) + ) { // check for conflicting Premium Java name Optional premiumUUID = Optional.empty(); try {