+ * This should be used for: + *
{ @@ -45,8 +48,28 @@ public abstract class JoinManagement
{ this.authHook = authHook; } - public void onLogin(String username, S source) { + public void onLogin(String username, S source, boolean floodgateAvailable) { core.getPlugin().getLog().info("Handling player {}", username); + + // check if the player is connecting through Geyser + if (floodgateAvailable && getFloodgatePlayer(username) != null) { + if (core.getConfig().get("allowFloodgateNameConflict").toString().equalsIgnoreCase("false")) { + core.getPlugin().getLog().info( + "Bedrock Player {}'s name conflits an existing Java Premium Player's name", + username); + try { + source.kick("Your name conflits an existing Java Premium Player's name"); + } catch (Exception e) { + e.printStackTrace(); + core.getPlugin().getLog().error("Could not kick Player {}", username); + } + } else { + core.getPlugin().getLog().info("Skipping name conflict checking for player {}", username); + return; + } + + } + StoredProfile profile = core.getStorage().loadProfile(username); if (profile == null) { return; @@ -130,6 +153,24 @@ public abstract class JoinManagement
{
return false;
}
+
+ /**
+ * Get a FloodgatePlayyer by their name.
+ * This is not supported by FloodgateApi.
+ *
+ * WARNING: This method does not check if the floodgate plugin is actually installed on the server!
+ * @param username the name of the player
+ * @return FloodgatePlayer if found, null if the player is not online
+ */
+ protected static FloodgatePlayer getFloodgatePlayer(String username) {
+ // the Floodgate API requires UUID, which is inaccessible at NameCheckTask.java
+ for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) {
+ if (floodgatePlayer.getUsername().equals(username)) {
+ return floodgatePlayer;
+ }
+ }
+ return null;
+ }
public abstract FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, S source, StoredProfile profile);
From 5858bfb443edf8b6da00aaccdafbb4c9bca24368 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sun, 9 May 2021 11:10:10 +0200
Subject: [PATCH 33/36] Add Floodgate name conflict check to ProtocolSupport
---
.../listener/protocolsupport/ProtocolSupportListener.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
index 3f5a0135..2ee40b8c 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
@@ -37,6 +37,7 @@ import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
import java.net.InetSocketAddress;
import java.util.Optional;
+import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -75,7 +76,9 @@ public class ProtocolSupportListener extends JoinManagement
{ @@ -48,28 +45,8 @@ public abstract class JoinManagement
{ this.authHook = authHook; } - public void onLogin(String username, S source, boolean floodgateAvailable) { + public void onLogin(String username, S source) { core.getPlugin().getLog().info("Handling player {}", username); - - // check if the player is connecting through Geyser - if (floodgateAvailable && getFloodgatePlayer(username) != null) { - if (core.getConfig().get("allowFloodgateNameConflict").toString().equalsIgnoreCase("false")) { - core.getPlugin().getLog().info( - "Bedrock Player {}'s name conflits an existing Java Premium Player's name", - username); - try { - source.kick("Your name conflits an existing Java Premium Player's name"); - } catch (Exception e) { - e.printStackTrace(); - core.getPlugin().getLog().error("Could not kick Player {}", username); - } - } else { - core.getPlugin().getLog().info("Skipping name conflict checking for player {}", username); - return; - } - - } - StoredProfile profile = core.getStorage().loadProfile(username); if (profile == null) { return; @@ -153,24 +130,6 @@ public abstract class JoinManagement
{
return false;
}
-
- /**
- * Get a FloodgatePlayyer by their name.
- * This is not supported by FloodgateApi.
- *
- * WARNING: This method does not check if the floodgate plugin is actually installed on the server!
- * @param username the name of the player
- * @return FloodgatePlayer if found, null if the player is not online
- */
- protected static FloodgatePlayer getFloodgatePlayer(String username) {
- // the Floodgate API requires UUID, which is inaccessible at NameCheckTask.java
- for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) {
- if (floodgatePlayer.getUsername().equals(username)) {
- return floodgatePlayer;
- }
- }
- return null;
- }
public abstract FastLoginPreLoginEvent callFastLoginPreLoginEvent(String username, S source, StoredProfile profile);
From d44ab4e634068f1559560af2ee07c2905cdde8fe Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sat, 15 May 2021 14:11:50 +0200
Subject: [PATCH 36/36] Warn when unsupported plugins are detected
Floodgate 1.0 does not work with the current Bukkit implementation.
ProtocolLib and Floodgate don' play along nicely when used with FastLogin
Related issue: #493
---
.../fastlogin/bukkit/FastLoginBukkit.java | 40 ++++++++++++++++++-
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 32294704..067bd9b6 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -47,10 +47,13 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.bukkit.Bukkit;
+import org.bukkit.Server.Spigot;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
+import org.geysermc.floodgate.api.FloodgateApi;
import org.slf4j.Logger;
/**
@@ -138,6 +141,8 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin