From 4ff97389c5ad4f0c9cdb55be8d74e10b0a98ff74 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Tue, 3 Dec 2019 16:05:17 +0100
Subject: [PATCH] Rules Command Deploy failed

---
 .../bbn/hadder/listener/RulesListener.java    | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index 43ca93f..7b35d9b 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -19,24 +19,13 @@ public class RulesListener extends ListenerAdapter {
 
     @Override
     public void onMessageReactionAdd(MessageReactionAddEvent event) {
-        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
-            if (event.getReactionEmote().isEmote()) {
-                if (rethink.getRulesAEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
+        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) {
+            if (!event.getMember().getUser().isBot()) {
+                if (event.getReactionEmote().getEmoji().equals("✅")) {
                     event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-                } else if (rethink.getRulesDEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
-                    event.getReaction().removeReaction(event.getUser()).queue();
-                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
-                        event.getMember().kick().reason("Declined the rules");
-                    }
-                }
-            } else {
-                if (event.getReactionEmote().getEmoji().equals(rethink.getRulesAEmote(event.getGuild().getId()))) {
-                    event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-                } else if (event.getReactionEmote().getEmoji().equals(rethink.getRulesDEmote(event.getGuild().getId()))) {
-                    event.getReaction().removeReaction(event.getUser()).queue();
-                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
-                        event.getMember().kick().reason("Declined the rules");
-                    }
+                } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) {
+                    event.getReaction().removeReaction().queue();
+                    event.getMember().kick().reason("Declined the rules");
                 }
             }
         }
@@ -44,8 +33,10 @@ public class RulesListener extends ListenerAdapter {
 
     @Override
     public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
-        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
+        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) {
+            if (!event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) {
                 event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
+            }
         }
     }
 }