diff --git a/pom.xml b/pom.xml
index c9d1eb8..1b74b55 100755
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
com.discord4j
discord4j-core
- 3.0.6
+ 3.0.8
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
index f1f81d6..2314994 100755
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
@@ -233,8 +233,8 @@ public class MCChatListener implements Listener {
timings.printElapsed("Filter 1");
return !(ev.getMessage().getChannelId().asLong() != module.chatChannel().get().asLong()
&& !(channel instanceof PrivateChannel
- && author.map(u -> MCChatPrivate.isMinecraftChatEnabled(u.getId().asString())).orElse(false)
- && !hasCustomChat)); //Chat isn't enabled on this channel
+ && author.map(u -> MCChatPrivate.isMinecraftChatEnabled(u.getId().asString())).orElse(false))
+ && !hasCustomChat); //Chat isn't enabled on this channel
}).filter(channel -> {
timings.printElapsed("Filter 2");
return !(channel instanceof PrivateChannel //Only in private chat
diff --git a/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java b/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java
index 3c6e775..babb47c 100644
--- a/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java
+++ b/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java
@@ -27,7 +27,7 @@ public class GameRoleModule extends Component {
@Override
protected void enable() {
getPlugin().getManager().registerCommand(new RoleCommand(this));
- GameRoles = DiscordPlugin.mainServer.getRoles().filterWhen(this::isGameRole).map(Role::getName).collect(Collectors.toList()).block();
+ GameRoles = DiscordPlugin.mainServer.getRoles().filterWhen(r -> isGameRole(r, false)).map(Role::getName).collect(Collectors.toList()).block();
}
@Override
@@ -47,7 +47,7 @@ public class GameRoleModule extends Component {
if (roleEvent instanceof RoleCreateEvent) {
Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> {
Role role=((RoleCreateEvent) roleEvent).getRole();
- grm.isGameRole(role).flatMap(b -> {
+ grm.isGameRole(role, false).flatMap(b -> {
if (!b)
return Mono.empty(); //Deleted or not a game role
GameRoles.add(role.getName());
@@ -68,7 +68,7 @@ public class GameRoleModule extends Component {
return;
}
Role or=event.getOld().get();
- grm.isGameRole(event.getCurrent()).flatMap(b -> {
+ grm.isGameRole(event.getCurrent(), true).flatMap(b -> {
if (!b) {
if (GameRoles.remove(or.getName()) && logChannel != null)
return logChannel.flatMap(ch -> ch.createMessage("Removed " + or.getName() + " as a game role because it's color changed."));
@@ -89,8 +89,8 @@ public class GameRoleModule extends Component {
}
}
- private Mono isGameRole(Role r) {
- boolean debug = r.getName().equalsIgnoreCase("Minecraft");
+ private Mono isGameRole(Role r, boolean debugMC) {
+ boolean debug = debugMC && r.getName().equalsIgnoreCase("Minecraft");
if (debug) TBMCCoreAPI.sendDebugMessage("Checking if Minecraft is a game role...");
if (r.getGuildId().asLong() != DiscordPlugin.mainServer.getId().asLong()) {
if (debug) TBMCCoreAPI.sendDebugMessage("Not in the main server: " + r.getGuildId().asString());