Only send to discord if event is not canceled - Fixed Exception where…

… jda was null
notTamion · Jun 8, 2023 · 73a84b4 · 73a84b4
1 parent aac0379
commit 73a84b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/de/tamion/discord/DCMain.java b/src/main/java/de/tamion/discord/DCMain.java
@@ -63,18 +63,18 @@ public static void startup() {
     }
 
     public static void shutdown() {
-        try {
-            EmbedBuilder eb = new EmbedBuilder();
-            eb.setTitle(config.getString("Bot.stopsyntax"));
-            eb.setColor(Color.RED);
-            Utils.sendtochat(eb.build());
-            Utils.sendtoconsole(eb.build());
-        } catch (IllegalArgumentException ignored) {}
         Logger log = (Logger) LogManager.getRootLogger();
         if(log.getAppenders().containsKey("DCChatConsoleAppender")) {
             log.removeAppender(log.getAppenders().get("DCChatConsoleAppender"));
         }
         if(jda != null) {
+            try {
+                EmbedBuilder eb = new EmbedBuilder();
+                eb.setTitle(config.getString("Bot.stopsyntax"));
+                eb.setColor(Color.RED);
+                Utils.sendtochat(eb.build());
+                Utils.sendtoconsole(eb.build());
+            } catch (IllegalArgumentException ignored) {}
             jda.shutdown();
         } else {
             MCMain.getPlugin().getLogger().info("Can't stop bot. Bot not running.");

diff --git a/src/main/java/de/tamion/minecraft/listeners/MCChat.java b/src/main/java/de/tamion/minecraft/listeners/MCChat.java
@@ -8,13 +8,13 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChatEvent;
 
-import java.util.HashMap;
-
 public class MCChat implements Listener {
      @EventHandler
      public void onChat(PlayerChatEvent e) {
          Player p = e.getPlayer();
          FileConfiguration config = MCMain.getPlugin().getConfig();
-         Utils.sendtochat(config.getString("Bot.dcsyntax").replaceAll("\\{username}", e.getPlayer().getName()).replaceAll("\\{message}", e.getMessage()));
+         if(!e.isCancelled()) {
+             Utils.sendtochat(config.getString("Bot.dcsyntax").replaceAll("\\{username}", e.getPlayer().getName()).replaceAll("\\{message}", e.getMessage()));
+         }
      }
 }