From 7a18172b0a8cbdb916a5e9aa5c4045c80cb68d13 Mon Sep 17 00:00:00 2001
From: Alex <alex@roese.dev>
Date: Sun, 13 Mar 2022 16:53:38 +0100
Subject: [PATCH] Added NumberFormatException check

---
 .../proxy/command/SendTestMessageCommand.java | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java
index 4dd5ffe..b06a722 100644
--- a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java
+++ b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java
@@ -23,44 +23,43 @@ public class SendTestMessageCommand extends Command {
       // /sendTestMessage <status> <cmdID> <dest> <cmdNumber> <msg>
 
       if (args.length == 5) {
-        int cmdID;
-
-        byte status = Byte.parseByte(args[0]);
-
-        if (status == KraSocketClientProtocolStatus.GET.getStatus()) {
-          cmdID = ProxySystem.getInstance().getKraSocketClientProtocol().generateCmdID();
-        } else {
-          cmdID = Byte.parseByte(args[1]);
-        }
-
-        Consumer<KraSocketClientProtocolMessage> consumer = null;
-        if (status == KraSocketClientProtocolStatus.GET.getStatus()) {
-          consumer = kraSocketClientProtocolMessage -> {
-            proxiedPlayer.sendMessage(new TextComponent(
-                "Received msg -> status:" + kraSocketClientProtocolMessage.getStatus()
-                    + " cmdID: "
-                    + kraSocketClientProtocolMessage.getCmdID() + " dest: "
-                    + kraSocketClientProtocolMessage.getDest() + " uuid: "
-                    + kraSocketClientProtocolMessage.getUuid() + " cmdNumber: "
-                    + kraSocketClientProtocolMessage.getCmdNumber() + " args: "
-                    + kraSocketClientProtocolMessage.getArgs()));
-          };
-        }
-
-        KraSocketClientProtocolMessage kraSocketClientProtocolMessage = null;
-
         try {
+          int cmdID;
+
+          byte status = Byte.parseByte(args[0]);
+
+          if (status == KraSocketClientProtocolStatus.GET.getStatus()) {
+            cmdID = ProxySystem.getInstance().getKraSocketClientProtocol().generateCmdID();
+          } else {
+            cmdID = Byte.parseByte(args[1]);
+          }
+
+          Consumer<KraSocketClientProtocolMessage> consumer = null;
+          if (status == KraSocketClientProtocolStatus.GET.getStatus()) {
+            consumer = kraSocketClientProtocolMessage -> {
+              proxiedPlayer.sendMessage(new TextComponent(
+                  "Received msg -> status:" + kraSocketClientProtocolMessage.getStatus()
+                      + " cmdID: "
+                      + kraSocketClientProtocolMessage.getCmdID() + " dest: "
+                      + kraSocketClientProtocolMessage.getDest() + " uuid: "
+                      + kraSocketClientProtocolMessage.getUuid() + " cmdNumber: "
+                      + kraSocketClientProtocolMessage.getCmdNumber() + " args: "
+                      + kraSocketClientProtocolMessage.getArgs()));
+            };
+          }
+
+          KraSocketClientProtocolMessage kraSocketClientProtocolMessage = null;
+
           kraSocketClientProtocolMessage = new KraSocketClientProtocolMessage(
               status, (byte) cmdID, Integer.parseInt(args[2]),
               proxiedPlayer.getUniqueId().toString(), Integer.parseInt(args[3]), args[4],
               consumer);
+
+          ProxySystem.getInstance().getKraSocketClient().getSocketClient()
+              .SendMessage(kraSocketClientProtocolMessage);
         } catch (NumberFormatException exception) {
           proxiedPlayer.sendMessage(new TextComponent("§7Error: §cNumberFormatException"));
-          return;
         }
-
-        ProxySystem.getInstance().getKraSocketClient().getSocketClient()
-            .SendMessage(kraSocketClientProtocolMessage);
       } else {
         proxiedPlayer.sendMessage(new TextComponent(
             "§cVerwendung: §7/sendTestMessage <status> <cmdID> <dest> <cmdNumber> <msg>"));