Fix bug in MobileEventHandler with blocking of nummer command

UnicacityAddon · Aug 4, 2022 · c938f89 · c938f89
1 parent 98e4073
commit c938f89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/rettichlp/UnicacityAddon/commands/ACallCommand.java b/src/main/java/com/rettichlp/UnicacityAddon/commands/ACallCommand.java
@@ -23,6 +23,7 @@
 public class ACallCommand extends CommandBase {
 
     final Timer timer = new Timer();
+    public static boolean isActive;
 
     @Override @Nonnull public String getName() {
         return "acall";
@@ -47,6 +48,7 @@ public class ACallCommand extends CommandBase {
                 .of("Syntax: " + getUsage(sender)).color(ColorCode.GRAY).advance()
                 .createComponent());
 
+        isActive = true;
         p.sendChatMessage("/nummer " + args[0]);
 
         timer.schedule(new TimerTask() {

diff --git a/src/main/java/com/rettichlp/UnicacityAddon/commands/ASMSCommand.java b/src/main/java/com/rettichlp/UnicacityAddon/commands/ASMSCommand.java
@@ -24,6 +24,7 @@
 public class ASMSCommand extends CommandBase {
 
     final Timer timer = new Timer();
+    public static boolean isActive;
 
     @Override @Nonnull public String getName() {
         return "asms";
@@ -48,6 +49,7 @@ public class ASMSCommand extends CommandBase {
                 .of("Syntax: " + getUsage(sender)).color(ColorCode.GRAY).advance()
                 .createComponent());
 
+        isActive = true;
         p.sendChatMessage("/nummer " + args[0]);
 
         timer.schedule(new TimerTask() {

diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/MobileEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/MobileEventHandler.java
@@ -2,6 +2,8 @@
 
 import com.rettichlp.UnicacityAddon.base.abstraction.AbstractionLayer;
 import com.rettichlp.UnicacityAddon.base.text.PatternHandler;
+import com.rettichlp.UnicacityAddon.commands.ACallCommand;
+import com.rettichlp.UnicacityAddon.commands.ASMSCommand;
 import net.minecraft.client.Minecraft;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
@@ -57,7 +59,10 @@ public void onClientChatReceived(ClientChatReceivedEvent e) {
         Matcher numberMatcher = PatternHandler.NUMBER_PATTERN.matcher(msg);
         if (numberMatcher.find()) {
             lastCheckedNumber = Integer.parseInt(numberMatcher.group(1));
-            e.setCanceled(true);
+            if (ACallCommand.isActive || ASMSCommand.isActive) {
+                e.setCanceled(true);
+                ACallCommand.isActive = ASMSCommand.isActive = false;
+            }
         }
     }