ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Projects Releases 8 Packages Wiki Activity

An even smaller fix could go an even longer way

Browse source
This commit is contained in:
Norbi Peti 2020-08-31 23:55:46 +02:00
parent 80a0312b1f
commit 3ee1eb3dec
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java
View file

@ -53,8 +53,8 @@ public class GameRoleModule extends Component<DiscordPlugin> {
*/
private final ReadOnlyConfigData<Color> roleColor = getConfig().<Color>getConfig("roleColor")
.def(new Color(149, 165, 166, 0))
.getter(rgb -> new Color(Integer.parseInt(((String) rgb).substring(1))))
.setter(color -> "#" + Integer.toHexString(color.getRGB())).buildReadOnly();
.getter(rgb -> new Color(Integer.parseInt(((String) rgb).substring(1), 16), true))
.setter(color -> String.format("#%08x", color.getRGB())).buildReadOnly();
public static void handleRoleEvent(RoleEvent roleEvent) {
val grm = ComponentManager.getIfEnabled(GameRoleModule.class);
@ -117,7 +117,6 @@ public class GameRoleModule extends Component<DiscordPlugin> {
if (r.getGuildId().asLong() != DiscordPlugin.mainServer.getId().asLong())
return Mono.just(false); //Only allow on the main server
val rc = roleColor.get();
System.out.println("Needed role color: " + rc);
return Mono.just(r.getColor().equals(rc)).filter(b -> b).flatMap(b ->
DiscordPlugin.dc.getSelf().flatMap(u -> u.asMember(DiscordPlugin.mainServer.getId()))
.flatMap(m -> m.hasHigherRoles(Collections.singleton(r)))) //Below one of our roles