AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow telnets to verify master builders, and mb httpd addition.

Browse Source
This commit is contained in:
ZeroEpoch1969 2018-05-21 19:49:03 -07:00
parent 69e82b5746
commit baf367b003
No known key found for this signature in database
GPG Key ID: E0AAB104FB9F8FDF
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
View File

@ -85,11 +85,7 @@ public class Command_mbconfig extends FreedomCommand
} }
checkConsole(); checkConsole();
checkRank(Rank.SENIOR_ADMIN); checkRank(Rank.TELNET_ADMIN);
if (!FUtil.isExecutive(sender.getName()))
{
noPerms();
}
// Player already on the list? // Player already on the list?
final Player player = getPlayer(args[1]); final Player player = getPlayer(args[1]);
@ -113,6 +109,12 @@ public class Command_mbconfig extends FreedomCommand
if (masterBuilder == null) // New entry if (masterBuilder == null) // New entry
{ {
checkRank(Rank.SENIOR_ADMIN);
if (!FUtil.isExecutive(sender.getName()))
{
noPerms();
}
if (player == null) if (player == null)
{ {
msg(FreedomCommand.PLAYER_NOT_FOUND); msg(FreedomCommand.PLAYER_NOT_FOUND);

9
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
View File

@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -24,6 +25,7 @@ public class Module_players extends HTTPDModule
final JSONObject responseObject = new JSONObject(); final JSONObject responseObject = new JSONObject();
final JSONArray players = new JSONArray(); final JSONArray players = new JSONArray();
final JSONArray masterbuilders = new JSONArray();
final JSONArray superadmins = new JSONArray(); final JSONArray superadmins = new JSONArray();
final JSONArray telnetadmins = new JSONArray(); final JSONArray telnetadmins = new JSONArray();
final JSONArray senioradmins = 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
developers.addAll(FUtil.DEVELOPERS); developers.addAll(FUtil.DEVELOPERS);
responseObject.put("players", players); responseObject.put("players", players);
responseObject.put("masterbuilders", masterbuilders);
responseObject.put("superadmins", superadmins); responseObject.put("superadmins", superadmins);
responseObject.put("telnetadmins", telnetadmins); responseObject.put("telnetadmins", telnetadmins);
responseObject.put("senioradmins", senioradmins); responseObject.put("senioradmins", senioradmins);