Bring changes from the official repo over to here

This commit is contained in:
ZeroEpoch1969 2018-06-01 22:36:37 -07:00
parent 6647088429
commit b8f4119924
No known key found for this signature in database
GPG Key ID: E0AAB104FB9F8FDF
3 changed files with 9 additions and 3 deletions

View File

@ -184,9 +184,9 @@
<version>3.3</version>
<configuration>
<outputFileName>TotalFreedomMod.jar</outputFileName>
<compilerVersion>1.7</compilerVersion>
<source>1.7</source>
<target>1.7</target>
<compilerVersion>1.8</compilerVersion>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

View File

@ -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

View File

@ -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