Merge branch 'development' into InstallerFrame

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/me/Danker/features/SpamHider.java b/src/main/java/me/Danker/features/SpamHider.java
index 4b22f61..a88d9e5 100644
--- a/src/main/java/me/Danker/features/SpamHider.java
+++ b/src/main/java/me/Danker/features/SpamHider.java
@@ -44,6 +44,13 @@ public class SpamHider {
         if (!ToggleCommand.implosionMessages) {
             if (message.contains("Your Implosion hit ") || message.contains("There are blocks in the way")) {
                 event.setCanceled(true);
+                return;
+            }
+        }
+        // Kill Combo
+        if (!ToggleCommand.killComboMessages) {
+            if ((message.contains("+") && message.contains(" Kill Combo ")) || message.contains("Your Kill Combo has expired!")) {
+                event.setCanceled(true);
             }
         }
     }