From b8f4119924c5947e5ff060df9e22ff31c675d2ed Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Fri, 1 Jun 2018 22:36:37 -0700
Subject: [PATCH] Bring changes from the official repo over to here
---
pom.xml | 6 +++---
.../totalfreedommod/command/Command_saconfig.java | 1 +
.../totalfreedommod/httpd/module/Module_players.java | 5 +++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd9b4a82..c3e51255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,9 +184,9 @@
3.3
TotalFreedomMod.jar
- 1.7
-
- 1.7
+ 1.8
+
+ 1.8
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
index 688eedeb..7572be8b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
@@ -200,6 +200,7 @@ public class Command_saconfig extends FreedomCommand
{
admin.setName(player.getName());
admin.addIp(Ips.getIp(player));
+ admin.getName().isEmpty();
}
// Handle master builders
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 e420343c..98ac0327 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
@@ -25,6 +25,7 @@ public class Module_players extends HTTPDModule
final JSONObject responseObject = new JSONObject();
final JSONArray players = new JSONArray();
+ final JSONArray onlineadmins = new JSONArray();
final JSONArray masterbuilders = new JSONArray();
final JSONArray superadmins = new JSONArray();
final JSONArray telnetadmins = new JSONArray();
@@ -35,6 +36,10 @@ public class Module_players extends HTTPDModule
for (Player player : Bukkit.getOnlinePlayers())
{
players.add(player.getName());
+ if (plugin.al.isAdmin(player) && !plugin.al.isAdminImpostor(player))
+ {
+ onlineadmins.add(player.getName());
+ }
}
// Admins