From 33261b9ea6909178d271d534266441b04ff819c5 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sun, 20 Jun 2021 17:37:18 +0200
Subject: [PATCH 1/2] Floodgate 2.0 is no longer in a seperate branch

---
 core/src/main/resources/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index 40baad8c..ea1e3a5e 100644
--- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml
@@ -189,7 +189,6 @@ autoLogin: true
 
 # Floodgate configuration
 # Connecing through Floodgate requires player's to sign in via their Xbox Live account
-# Requires Floodgate 2.0 https://github.com/GeyserMC/Floodgate/tree/dev/2.0
 # !!!!!!!! WARNING: FLOODGATE SUPPORT IS AN EXPERIMENTAL FEATURE !!!!!!!!
 # Enabling any of these settings might lead to people gaining unauthorized access to other's accounts!
 

From 2ffe7e0dafa46c49f061d9f49c1e0ef75f02e053 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sun, 20 Jun 2021 17:44:46 +0200
Subject: [PATCH 2/2] Replace word 'Player' with 'Account' in messages.

Technically speaking, one player can own both the Java and the Bedrock
account with the same name, so it's more appropriate to say account
instead of player.
---
 .../games647/fastlogin/core/hooks/FloodgateHook.java       | 7 ++++---
 .../fastlogin/core/shared/FloodgateManagement.java         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/github/games647/fastlogin/core/hooks/FloodgateHook.java b/core/src/main/java/com/github/games647/fastlogin/core/hooks/FloodgateHook.java
index fc030325..4e3935f9 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/hooks/FloodgateHook.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/hooks/FloodgateHook.java
@@ -69,17 +69,18 @@ public class FloodgateHook<P extends C, C, S extends LoginSource> {
                         "Could not check wether Floodgate Player {}'s name conflicts a premium Java player's name.",
                         username);
                 try {
-                    source.kick("Could not check if your name conflicts an existing Java Premium Player's name");
+                    source.kick("Could not check if your name conflicts an existing premium Java account's name.\n"
+                            + "This is usually a serverside error.");
                 } catch (Exception e1) {
                     core.getPlugin().getLog().error("Could not kick Player {}", username);
                 }
             }
 
             if (premiumUUID.isPresent()) {
-                core.getPlugin().getLog().info("Bedrock Player {}'s name conflicts an existing Java Premium Player's name",
+                core.getPlugin().getLog().info("Bedrock Player {}'s name conflicts an existing premium Java account's name",
                         username);
                 try {
-                    source.kick("Your name conflicts an existing Java Premium Player's name");
+                    source.kick("Your name conflicts an existing premium Java account's name");
                 } catch (Exception e) {
                     core.getPlugin().getLog().error("Could not kick Player {}", username);
                 }
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
index 6c87698b..623551a5 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
@@ -94,7 +94,7 @@ public abstract class FloodgateManagement<P extends C, C, L extends LoginSession
                 premiumUUID = core.getResolver().findProfile(username);
             } catch (IOException | RateLimitException e) {
                 core.getPlugin().getLog().error(
-                        "Could not check wether Floodgate Player {}'s name conflits a premium Java player's name.",
+                        "Could not check wether Floodgate Player {}'s name conflits a premium Java account's name.",
                         username);
                 return;
             }