From faf208bed7028d0b540d22deac4ace62e2441b23 Mon Sep 17 00:00:00 2001
From: rina <k@rina.fyi>
Date: Fri, 19 Jul 2024 19:46:45 +1000
Subject: [PATCH] amendment: add NoNameservers and remove ValueError from
 squashed errors

ValueError might be thrown by programming errors in
json handling, for example.
---
 mcstatus/__main__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mcstatus/__main__.py b/mcstatus/__main__.py
index b31be34b..811a6aaf 100644
--- a/mcstatus/__main__.py
+++ b/mcstatus/__main__.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import dns.resolver
 import sys
 import json as _json
 import argparse
@@ -143,11 +144,11 @@ def main(argv: list[str]) -> int:
 
     args = parser.parse_args(argv)
     lookup = JavaServer.lookup if not args.bedrock else BedrockServer.lookup
-    server = lookup(args.address)
 
     try:
+        server = lookup(args.address)
         return args.func(server)
-    except (socket.timeout, socket.gaierror, ValueError) as e:
+    except (socket.timeout, socket.gaierror, dns.resolver.NoNameservers) as e:
         # catch and hide traceback for expected user-facing errors
         print(f"Error: {e}", file=sys.stderr)
         return 1