Upstream
/
DiscordWhitelisterSpigot
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed bug not assigning roles on multiple servers. Fixed a config variable not hot reloading.

This commit is contained in:
BuildTools 2020-06-30 19:54:39 +01:00
parent f47cd33a4f
commit d1acb83f10
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/uk/co/angrybee/joe/DiscordClient.java
View File

@ -624,13 +624,19 @@ public class DiscordClient extends ListenerAdapter
channel.sendMessage(embedBuilderWhitelistSuccess.build()).queue();
// Add role to user when they have been added to the whitelist if need be
if(whitelistedRoleAutoAdd) {
if(whitelistedRoleAutoAdd)
{
Role whitelistRole = null;
try {
whitelistRole = javaDiscordAPI.getRolesByName(whitelistedRoleName, false).get(0);
try
{
//whitelistRole = javaDiscordAPI.getRolesByName(whitelistedRoleName, false).get(0);
// Multiple server fix
whitelistRole = channel.getGuild().getRolesByName(whitelistedRoleName, false).get(0);
Member member = messageReceivedEvent.getMember();
messageReceivedEvent.getGuild().addRoleToMember(member, whitelistRole).queue();
} catch (Exception e) {
}
catch (Exception e)
{
DiscordWhitelister.getPlugin().getLogger().severe("Could not add role with name " + whitelistedRoleName + " to " + author.getName() + ", check that it has the correct name in the config and the bot has the Manage Roles permission");
}
}
@ -653,13 +659,19 @@ public class DiscordClient extends ListenerAdapter
channel.sendMessage(embedBuilderWhitelistSuccess.build()).queue();
// Add role to user when they have been added to the whitelist if need be
if(whitelistedRoleAutoAdd) {
if(whitelistedRoleAutoAdd)
{
Role whitelistRole = null;
try {
whitelistRole = javaDiscordAPI.getRolesByName(whitelistedRoleName, false).get(0);
try
{
//whitelistRole = javaDiscordAPI.getRolesByName(whitelistedRoleName, false).get(0);
// Multiple server fix
whitelistRole = channel.getGuild().getRolesByName(whitelistedRoleName, false).get(0);
Member member = messageReceivedEvent.getMember();
messageReceivedEvent.getGuild().addRoleToMember(member, whitelistRole).queue();
} catch (Exception e) {
}
catch (Exception e)
{
DiscordWhitelister.getPlugin().getLogger().severe("Could not add role with name " + whitelistedRoleName + " to " + author.getName() + ", check that it has the correct name in the config and the bot has the Manage Roles permission");
}
}
@ -982,7 +994,8 @@ public class DiscordClient extends ListenerAdapter
return correctUsername;
}
private String minecraftUsernameToUUID(String minecraftUsername) {
private String minecraftUsernameToUUID(String minecraftUsername)
{
URL playerURL;
String inputStream;
BufferedReader bufferedReader;
@ -1005,7 +1018,8 @@ public class DiscordClient extends ListenerAdapter
return playerUUID;
}
private void executeServerCommand(String command) {
private void executeServerCommand(String command)
{
DiscordWhitelister.getPlugin().getServer().getScheduler().callSyncMethod(DiscordWhitelister.getPlugin(), ()
-> DiscordWhitelister.getPlugin().getServer().dispatchCommand(
DiscordWhitelister.getPlugin().getServer().getConsoleSender(), command));

3
src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java
View File

@ -205,8 +205,7 @@ public class DiscordWhitelister extends JavaPlugin
}
// Custom messages check
if(getWhitelisterBotConfig().getBoolean("use-custom-messages"))
useCustomMessages = true;
useCustomMessages = getWhitelisterBotConfig().getBoolean("use-custom-messages");
int initSuccess = DiscordClient.InitializeClient(botToken);