Upstream/DiscordWhitelisterSpigot
1
0
Fork 0
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git synced 2025-02-01 13:01:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40 from dbwrush/master

Browse Source 
Added compatibility with GeyserMC/Floodgate
This commit is contained in:
Joe Shimell 2021-03-05 22:59:08 +00:00 committed by GitHub
commit d851de5474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/uk/co/angrybee/joe/commands/discord/CommandAdd.java
View File

@ -473,6 +473,9 @@ public class CommandAdd
if (!WhitelistedPlayers.usingEasyWhitelist && authorPermissions.isUserCanUseCommand())
DiscordClient.ExecuteServerCommand("whitelist add " + finalNameToAdd);
if(MainConfig.getMainConfig().getBoolean("use-geyser/floodgate-compatibility")) {
addBedrockUser(finalNameToAdd);
}
// have to use !invalidMinecraftName else the easy whitelist plugin will add the name regardless of whether it is valid on not
if (WhitelistedPlayers.usingEasyWhitelist && !invalidMinecraftName && authorPermissions.isUserCanUseCommand())
@ -615,4 +618,16 @@ public class CommandAdd
}
}
}
private static void addBedrockUser(String finalNameToAdd) {
String bedrockPrefix = MainConfig.getMainConfig().getString("geyser/floodgate prefix");
String bedrockName = bedrockPrefix + finalNameToAdd;
if(bedrockName.length() > 16) {
bedrockName = bedrockName.substring(0, 16);
}
//check if we actually NEED to add
if(finalNameToAdd.length() < bedrockPrefix.length() || !finalNameToAdd.substring(0, bedrockPrefix.length() - 1).equals(bedrockPrefix)) {
DiscordClient.ExecuteServerCommand("whitelist add " + bedrockName);
}
}
}

4
src/main/java/uk/co/angrybee/joe/configs/MainConfig.java
View File

@ -157,6 +157,10 @@ public class MainConfig
CheckEntry("use-crafatar-for-avatars", false);
CheckEntry("use-geyser/floodgate-compatibility", false);
CheckEntry("geyser/floodgate prefix", "SetThisToWhateverPrefixYouUse");
// Remove old role entry if found, move role to new array (for people with v1.3.6 or below)
if(whitelisterBotConfig.get("whitelisted-role") != null)
{