Let MessageProcessor#process callers handle channel switching.

Author: M0diis

plugin/src/main/java/at/helpch/chatchat/command/SwitchChannelCommand.java

@@ -57,6 +57,6 @@ public void switchChannel(final ChatUser user, @Join @Optional @NotNull final St
             return;
         }
 
-        MessageProcessor.process(plugin, user, channel, user.channel(), message, false);
+        MessageProcessor.process(plugin, user, channel, message, false);
     }
 }

plugin/src/main/java/at/helpch/chatchat/listener/ChatListener.java

@@ -101,14 +101,8 @@ public void onChat(final AsyncPlayerChatEvent event) {
 
         // Cancel the event if the message doesn't end up being sent
         // This only happens if the message contains illegal characters or if the ChatChatEvent is canceled.
-        boolean cancelled = MessageProcessor.process(plugin, user, channel, oldChannel, message, event.isAsynchronous());
-
-        event.setCancelled(!cancelled);
-
-        // If the event was cancelled, we need to reset the user back to their old channel
-        if(cancelled) {
-            user.channel(oldChannel);
-        }
+        event.setCancelled(!MessageProcessor.process(plugin, user, channel, message, event.isAsynchronous()));
+        user.channel(oldChannel);
     }
 
     private static String cleanseMessage(@NotNull final String message) {

plugin/src/main/java/at/helpch/chatchat/util/MessageProcessor.java

@@ -64,8 +64,6 @@ private MessageProcessor() {
      * @param plugin The plugin instance.
      * @param user The user sending the message.
      * @param channel The channel the user is sending the message to.
-     * @param previousChannel The previous channel the user was in. Used to switch back to after sending the message.
-     *                        Used to switch back when sending a message to a channel with a prefix.
      * @param message The message to send.
      * @param async Whether to process the message asynchronously.
      *
@@ -75,7 +73,6 @@ public static boolean process(
         @NotNull final ChatChatPlugin plugin,
         @NotNull final ChatUser user,
         @NotNull final Channel channel,
-        @NotNull final Channel previousChannel,
         @NotNull final String message,
         final boolean async
     ) {
@@ -185,7 +182,6 @@ public static boolean process(
         }
 
         if (!userIsTarget) {
-            user.channel(previousChannel);
             return true;
         }
 
@@ -211,7 +207,6 @@ public static boolean process(
             user.playSound(mentions.sound());
         }
 
-        user.channel(previousChannel);
         return true;
     }