From fed1e91b2802a0f906b04d86b8f436dbd45ba882 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sat, 22 May 2021 14:10:32 +0200
Subject: [PATCH] Document 'no-conflict' in config.yml

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

diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index 768b3e3a..5164aa9c 100644
--- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml
@@ -199,6 +199,9 @@ autoLogin: true
 #   false: Disables auto login for every player connecting through Floodgate
 #   true: Enables auto login for every player connecting through Floodgate
 #   linked: Only Bedrock accounts that are linked to a Java account will be logged in automatically
+#   no-conflict: Bedrock players will only be automatically logged in if the Mojang API reports
+#     that there is no existing Premium Java MC account with their name.
+#     This option can be useful if you are not using 'username-prefix' in floodgate/config.yml
 # !!!!!!!! WARNING: FLOODGATE SUPPORT IS AN EXPERIMENTAL FEATURE !!!!!!!!
 # Enabling this might lead to people gaining unauthorized access to other's accounts!
 autoLoginFloodgate: false
@@ -228,10 +231,13 @@ autoLoginFloodgate: false
 allowFloodgateNameConflict: false
 
 # Automatically register players connecting through Floodgate.
-# autoLoginFloodgate must be 'true' for this to work
+# autoLoginFloodgate must be available for the player to use this
 # Possible values:
 #   false: Disables auto registering for every player connecting through Floodgate
 #   true: Enables auto registering for every player connecting through Floodgate
+#   no-conflict: Bedrock players will only be automatically registered if the Mojang API reports
+#     that there is no existing Premium Java MC account with their name.
+#     This option can be useful if you are not using 'username-prefix' in floodgate/config.yml
 # !!!!!!!! WARNING: FLOODGATE SUPPORT IS AN EXPERIMENTAL FEATURE !!!!!!!!
 # Enabling this might lead to people gaining unauthorized access to other's accounts!
 autoRegisterFloodgate: false