From f14600796f3d5ed511490ed97ad76cfb2c729675 Mon Sep 17 00:00:00 2001
From: Jimmy Maple <jmaple@splunk.com>
Date: Tue, 2 Jun 2020 14:59:08 -0400
Subject: [PATCH] fix: query_gamedig.sh tuning for correct player count

Reworked the jq flags to produce a count of players based on the length of the original JSON key used. However, I've found that while things like TF2 will produce the proper value, the Minecraft plugin will have an extra user online that is empty. See example below:

"players": [
    {
      "id": "81eeda65-9002-4f0d-9d3f-b4872e2a2042",
      "name": "iamjack1221"
    },
    {}
  ]
---
 lgsm/functions/query_gamedig.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh
index 285cf0805..6e3a9122a 100644
--- a/lgsm/functions/query_gamedig.sh
+++ b/lgsm/functions/query_gamedig.sh
@@ -32,11 +32,15 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ];
 		fi
 
 		# numplayers.
-		gdplayers=$(echo "${gamedigraw}" | jq -re '.raw.vanilla.raw.players.online')
+		if [ "${querytype}" == "minecraft" ]; then
+				gdplayers=$(echo "${gamedigraw}" | jq -re '.players | length-1')
+			else
+				gdplayers=$(echo "${gamedigraw}" | jq -re '.players | length')
+		fi
 		if [ "${gdplayers}" == "null" ]; then
 			unset gdplayers
-		elif [ "${gdplayers}" == "[]" ]; then
-			gdplayers=0
+		elif [ "${gdplayers}" == "[]" ] || [ "${gdplayers}" == "-1" ]; then
+		 	gdplayers=0
 		fi
 
 		# maxplayers.
@@ -60,7 +64,7 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ];
 		fi
 
 		# numbots.
-		gdbots=$(echo "${gamedigraw}" | jq -re '.raw.numbots')
+		gdbots=$(echo "${gamedigraw}" | jq -re '.bots | length')
 		if [ "${gdbots}" == "null" ]||[ "${gdbots}" == "0" ]; then
 			unset gdbots
 		fi