feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Add floodgate service to Bungee

Browse Source
This commit is contained in:
games647
2021-10-05 15:42:40 +02:00
parent a3bf875976
commit 28480a0f01
9 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/github/games647/fastlogin/core/hooks/FloodgateService.java
+5 -3
View File
@@ -41,9 +41,11 @@ import org.geysermc.floodgate.api.player.FloodgatePlayer;
public class FloodgateService {
private final FloodgateApi floodgate;
private final FastLoginCore<?, ?, ?> core;
public FloodgateService(FastLoginCore<?, ?, ?> core) {
public FloodgateService(FloodgateApi floodgate, FastLoginCore<?, ?, ?> core) {
this.floodgate = floodgate;
this.core = core;
}
@@ -84,10 +86,11 @@ public class FloodgateService {
* @param username the name of the player
* @param source an instance of LoginSource
*/
public void checkFloodgateNameConflict(String username, LoginSource source, FloodgatePlayer floodgatePlayer) {
public void checkNameConflict(String username, LoginSource source) {
String allowConflict = core.getConfig().get("allowFloodgateNameConflict").toString().toLowerCase();
// check if the Bedrock player is linked to a Java account
FloodgatePlayer floodgatePlayer = getFloodgatePlayer(username);
boolean isLinked = floodgatePlayer.getLinkedPlayer() != null;
if ("false".equals(allowConflict)
@@ -151,6 +154,5 @@ public class FloodgateService {
public boolean isFloodgateConnection(String username) {
return getFloodgatePlayer(username) != null;
}
}
core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
+1 -3
View File
@@ -36,8 +36,6 @@ import java.util.Optional;
import net.md_5.bungee.config.Configuration;
import org.geysermc.floodgate.api.player.FloodgatePlayer;
public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
protected final FastLoginCore<P, C, ?> core;
@@ -60,7 +58,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
//check if the player is connecting through Floodgate
if (floodgateService != null) {
if (floodgateService.isFloodgateConnection(username)) {
floodgateService.checkFloodgateNameConflict(username, source, floodgatePlayer);
floodgateService.checkNameConflict(username, source);
// skip flow for any floodgate player
return;
}