From 27374743a7a4e6caaefc0e83cf67c9f6f9ca39c2 Mon Sep 17 00:00:00 2001
From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com>
Date: Mon, 10 Jul 2023 00:52:06 +0200
Subject: [PATCH 1/3] added catch for wrong query port

---
 cmd-v1.0.py | 47 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/cmd-v1.0.py b/cmd-v1.0.py
index f0b31b2..4985e91 100644
--- a/cmd-v1.0.py
+++ b/cmd-v1.0.py
@@ -3,37 +3,59 @@ from time import sleep
 
 ip = input("Please Enter server IP: ")
 port = input("Enter Port (press enter for default port 25565, enter * if unknown): ")
+q_port = input("Enter Query Port (press enter for default port 25565 or if unknown): ") # added query port input
 delay = input("How many seconds do you want in between status updates?: ")
 
 if delay == "":
     delay = "0"
 
-delay_int = int(delay)
+# why the delay here?
+#delay_int = int(delay)
 
 if port == "":
     port = "25565"
 
+# query port set to default if empty
+if q_port == "":
+    q_port = "25565"
+
 if port == "*":
     server = JavaServer.lookup(ip)
 else:
     server = JavaServer.lookup(ip + ":" + port)
 
+try:
+    server.query(query_port=int(q_port))
+    query = True
+except:
+    print("Query port is wrong or query is disabled.")
+    query = False
 
 if port == "*":
     while True:
         status = server.status()
         query = server.query()
         ping = server.ping()
-        print("---------- " + ip + ":" + f"{query.raw['hostport']}" + " ----------")
+
+        # for every if statement here, print query fetched information only if query is enabled
+        if query:
+            print("---------- " + ip + ":" + f"{query.raw['hostport']}" + " ----------")
+        else:
+            print("---------- " + ip + ":" + port + " ----------")
+        
         print(f"Version: v{status.version.name} (protocol {status.version.protocol})")
         print(f'Description: "{status.description}"')
 
-        print(f"Host: {query.raw['hostip']}:{query.raw['hostport']}")
-        print(f"Software: v{query.software.version} {query.software.brand}")
-        print(f"Plugins: {query.software.plugins}")
+        if query:
+            print(f"Host: {query.raw['hostip']}:{query.raw['hostport']}")
+            print(f"Software: v{query.software.version} {query.software.brand}")
+            print(f"Plugins: {query.software.plugins}")
+        
         print(f"Ping: {ping} ms")
         print(f"Players: {status.players.online}/{status.players.max}")
-        print(f"Players Online: {query.players.names}")
+
+        if query:
+            print(f"Players Online: {query.players.names}")
         print("\n")
         sleep(delay_int)
 
@@ -46,12 +68,17 @@ if port != "*":
         print(f"Version: v{status.version.name} (protocol {status.version.protocol})")
         print(f'Description: "{status.description}"')
 
-        print(f"Host: {query.raw['hostip']}:{query.raw['hostport']}")
-        print(f"Software: v{query.software.version} {query.software.brand}")
-        print(f"Plugins: {query.software.plugins}")
+        if query:
+            print(f"Host: {query.raw['hostip']}:{query.raw['hostport']}")
+            print(f"Software: v{query.software.version} {query.software.brand}")
+            print(f"Plugins: {query.software.plugins}")
+        
         print(f"Ping: {ping} ms")
         print(f"Players: {status.players.online}/{status.players.max}")
-        print(f"Players Online: {query.players.names}")
+
+        if query:
+            print(f"Players Online: {query.players.names}")
+        
         print("\n")
         sleep(delay_int)
 

From 3beccd2c0a769088d59a2b24931d1868af9480c6 Mon Sep 17 00:00:00 2001
From: Austin Prine <tw25@twinblaze.dev>
Date: Sun, 9 Jul 2023 16:37:44 -0700
Subject: [PATCH 2/3] Update cmd-v1.0.py

---
 cmd-v1.0.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmd-v1.0.py b/cmd-v1.0.py
index 4985e91..977215f 100644
--- a/cmd-v1.0.py
+++ b/cmd-v1.0.py
@@ -3,21 +3,20 @@ from time import sleep
 
 ip = input("Please Enter server IP: ")
 port = input("Enter Port (press enter for default port 25565, enter * if unknown): ")
-q_port = input("Enter Query Port (press enter for default port 25565 or if unknown): ") # added query port input
+q_port = input("Enter Query Port (press enter for matching or if unknown): ") # added query port input
 delay = input("How many seconds do you want in between status updates?: ")
 
 if delay == "":
     delay = "0"
 
-# why the delay here?
-#delay_int = int(delay)
+delay_int = int(delay)
 
 if port == "":
     port = "25565"
 
 # query port set to default if empty
 if q_port == "":
-    q_port = "25565"
+    q_port = port
 
 if port == "*":
     server = JavaServer.lookup(ip)

From 87ca0c09271e8cb8024220426ee5ffe75391a362 Mon Sep 17 00:00:00 2001
From: Austin Prine <tw25@twinblaze.dev>
Date: Sun, 9 Jul 2023 16:38:17 -0700
Subject: [PATCH 3/3] Update cmd-v1.0.py

---
 cmd-v1.0.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd-v1.0.py b/cmd-v1.0.py
index 977215f..8ded8d6 100644
--- a/cmd-v1.0.py
+++ b/cmd-v1.0.py
@@ -14,7 +14,7 @@ delay_int = int(delay)
 if port == "":
     port = "25565"
 
-# query port set to default if empty
+# query port set to matching if empty
 if q_port == "":
     q_port = port