Merge pull request #42 from oskar3123/38-cancelling-a-staff-chat-event-will-allow-the-chat-message

Fix cancelling staff chat events

src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java

@@ -52,6 +52,8 @@ public class BungeeChatListener implements Listener {
       return;
     }
 
+    event.setCancelled(true);
+
     String format = Objects.requireNonNull(config.getString("settings.format", ""));
     String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
 
@@ -80,8 +82,6 @@ public class BungeeChatListener implements Listener {
         .filter(p -> p.hasPermission(Permissions.SEE.permission()))
         .forEach(p -> p.sendMessage(messageComponents));
     plugin.getLogger().info(ChatColor.stripColor(appliedFormat));
-
-    event.setCancelled(true);
   }
 
   @Contract("_ -> new")

src/main/java/me/oskar3123/staffchat/spigot/handler/StaffChatHandler.java

@@ -48,6 +48,8 @@ public class StaffChatHandler {
       return;
     }
 
+    event.setCancelled(true);
+
     String format = Objects.requireNonNull(config.getString("settings.format", ""));
     String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
     if (config.getBoolean("settings.replaceplaceholdersinmessage")) {
@@ -70,8 +72,6 @@ public class StaffChatHandler {
     if (plugin.getConfig().getBoolean("discordsrv.enable")) {
       sendDiscordMessage(event.getPlayer(), message);
     }
-
-    event.setCancelled(true);
   }
 
   public void sendStaffChatMessage(String format, Supplier<String> nameSupplier, String message) {