finish up chat tabs + chat message copying

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/raeids/stratus/mixin/GuiUtilRenderComponentsMixin.java b/src/main/java/com/raeids/stratus/mixin/GuiUtilRenderComponentsMixin.java
index 05378cd..8579f7a 100644
--- a/src/main/java/com/raeids/stratus/mixin/GuiUtilRenderComponentsMixin.java
+++ b/src/main/java/com/raeids/stratus/mixin/GuiUtilRenderComponentsMixin.java
@@ -1,5 +1,6 @@
 package com.raeids.stratus.mixin;
 
+import com.raeids.stratus.config.StratusConfig;
 import com.raeids.stratus.hook.ChatTabs;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiUtilRenderComponents;
@@ -16,11 +17,11 @@ import java.util.List;
 public class GuiUtilRenderComponentsMixin {
     @Inject(method = "splitText", at = @At("HEAD"), cancellable = true)
     private static void cancelText(IChatComponent k, int s1, FontRenderer chatcomponenttext, boolean l, boolean chatcomponenttext2, CallbackInfoReturnable<List<IChatComponent>> cir) {
-        if (ChatTabs.INSTANCE.isDoing()) {
-            ChatTabs.INSTANCE.setDoing(false);
-            if (!ChatTabs.INSTANCE.shouldRender(k.getUnformattedTextForChat())) {
+        if (StratusConfig.INSTANCE.getChatTabs() && ChatTabs.INSTANCE.isDoing()) {
+            if (!ChatTabs.INSTANCE.shouldRender(k)) {
                 cir.setReturnValue(Collections.emptyList());
             }
+            ChatTabs.INSTANCE.setDoing(false);
         }
     }
 }