From da1bec6cc02abfc0b8e635ba2225567f520dd58e Mon Sep 17 00:00:00 2001
From: Seth <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Fri, 10 Jul 2020 02:09:47 -0700
Subject: [PATCH] 2 MB bug fixes

---
 .../command/Command_mbconfig.java               | 17 ++++++++++++++++-
 .../totalfreedommod/sql/SQLite.java             |  6 +-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
index c140d0f8..cbc0e349 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
@@ -46,7 +46,22 @@ public class Command_mbconfig extends FreedomCommand
                 }
 
                 final Player player = getPlayer(args[1]);
-                PlayerData data = plugin.pl.getData(player);
+
+                PlayerData data;
+
+                if (player == null)
+                {
+                    data = plugin.pl.getData(args[1]);
+                    if (data == null)
+                    {
+                        msg(PLAYER_NOT_FOUND);
+                        return true;
+                    }
+                }
+                else
+                {
+                    data = plugin.pl.getData(player);
+                }
 
                 if (data.isMasterBuilder() && plugin.pl.isPlayerImpostor(player))
                 {
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
index aff96c1a..b6d91415 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
@@ -334,11 +334,7 @@ public class SQLite extends FreedomService
     {
         try
         {
-            ResultSet resultSet = connection.createStatement().executeQuery("SELECT * FROM players WHERE master_builder=true");
-            if (resultSet.next())
-            {
-                return resultSet;
-            }
+            return connection.createStatement().executeQuery("SELECT * FROM players WHERE master_builder=true");
         }
         catch (SQLException e)
         {