From baf367b00354b1a36fccf41bf5162a7bc5763092 Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Mon, 21 May 2018 19:49:03 -0700
Subject: [PATCH] Allow telnets to verify master builders, and mb httpd
 addition.

---
 .../totalfreedommod/command/Command_mbconfig.java    | 12 +++++++-----
 .../totalfreedommod/httpd/module/Module_players.java |  9 +++++++++
 2 files changed, 16 insertions(+), 5 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 5ca93938..78b87135 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
@@ -85,11 +85,7 @@ public class Command_mbconfig extends FreedomCommand
                 }
 
                 checkConsole();
-                checkRank(Rank.SENIOR_ADMIN);
-                if (!FUtil.isExecutive(sender.getName()))
-                {
-                    noPerms();
-                }
+                checkRank(Rank.TELNET_ADMIN);
 
                 // Player already on the list?
                 final Player player = getPlayer(args[1]);
@@ -113,6 +109,12 @@ public class Command_mbconfig extends FreedomCommand
 
                 if (masterBuilder == null) // New entry
                 {
+                    checkRank(Rank.SENIOR_ADMIN);
+                    if (!FUtil.isExecutive(sender.getName()))
+                    {
+                        noPerms();
+                    }
+
                     if (player == null)
                     {
                         msg(FreedomCommand.PLAYER_NOT_FOUND);
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
index a8810dc7..e420343c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
@@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
+import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -24,6 +25,7 @@ public class Module_players extends HTTPDModule
         final JSONObject responseObject = new JSONObject();
 
         final JSONArray players = new JSONArray();
+        final JSONArray masterbuilders = new JSONArray();
         final JSONArray superadmins = new JSONArray();
         final JSONArray telnetadmins = new JSONArray();
         final JSONArray senioradmins = new JSONArray();
@@ -54,10 +56,17 @@ public class Module_players extends HTTPDModule
             }
         }
 
+        // Master Builders
+        for (MasterBuilder masterBuilder : plugin.mbl.getAllMasterBuilders().values())
+        {
+            masterbuilders.add(masterBuilder.getName());
+        }
+
         // Developers
         developers.addAll(FUtil.DEVELOPERS);
 
         responseObject.put("players", players);
+        responseObject.put("masterbuilders", masterbuilders);
         responseObject.put("superadmins", superadmins);
         responseObject.put("telnetadmins", telnetadmins);
         responseObject.put("senioradmins", senioradmins);