From ce2873fa8135e0df0fa66d5a61976d50ad1f0878 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Sun, 29 Nov 2020 15:18:03 +1030
Subject: [PATCH] Some more type checking on QueryScalar

---
 TShockAPI/Extensions/DbExt.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/Extensions/DbExt.cs b/TShockAPI/Extensions/DbExt.cs
index 45599136..40a5df95 100644
--- a/TShockAPI/Extensions/DbExt.cs
+++ b/TShockAPI/Extensions/DbExt.cs
@@ -100,9 +100,12 @@ namespace TShockAPI.DB
 						com.AddParameter("@" + i, args[i]);
 
 					object output = com.ExecuteScalar();
-					if (typeof(IConvertible).IsAssignableFrom(output.GetType()))
+					if (output.GetType() != typeof(T))
 					{
-						return (T)Convert.ChangeType(output, typeof(T));
+						if (typeof(IConvertible).IsAssignableFrom(output.GetType()))
+						{
+							return (T)Convert.ChangeType(output, typeof(T));
+						}
 					}
 
 					return (T)output;