Fork/herobrine-2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When a player uses the help command, help will only be listed for commands that they have permission to use

Browse Source
This commit is contained in:
David Berdik 2019-12-30 14:32:34 -05:00
parent 8a3d6974ee
commit e74b5b7c8e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/theprogrammersworld/herobrine/commands/CmdExecutor.java
View File

@ -49,6 +49,7 @@ public class CmdExecutor implements CommandExecutor {
ArrayList<String> helpMessage = new ArrayList<String>(); ArrayList<String> helpMessage = new ArrayList<String>();
HashMap<String, String> helpMessageDesc = new HashMap<>(); HashMap<String, String> helpMessageDesc = new HashMap<>();
HashMap<String, String> permissionNode = new HashMap<>();
helpMessage.add(ChatColor.GREEN + "/herobrine help"); helpMessage.add(ChatColor.GREEN + "/herobrine help");
helpMessageDesc.put(helpMessage.get(0), ChatColor.GREEN + "Shows this list of Herobrine commands"); helpMessageDesc.put(helpMessage.get(0), ChatColor.GREEN + "Shows this list of Herobrine commands");
@ -56,6 +57,7 @@ public class CmdExecutor implements CommandExecutor {
for (String v : helpCommandOrder) { for (String v : helpCommandOrder) {
helpMessage.add(((SubCommand) subCommands.get(v)).help()); helpMessage.add(((SubCommand) subCommands.get(v)).help());
helpMessageDesc.put(((SubCommand) subCommands.get(v)).help(), ((SubCommand) subCommands.get(v)).helpDesc()); helpMessageDesc.put(((SubCommand) subCommands.get(v)).help(), ((SubCommand) subCommands.get(v)).helpDesc());
permissionNode.put(((SubCommand) subCommands.get(v)).help(), v);
} }
if (player == null) { if (player == null) {
@ -66,9 +68,11 @@ public class CmdExecutor implements CommandExecutor {
else { else {
player.sendMessage(ChatColor.RED + "[Herobrine] Command List (hover over commands for more info)"); player.sendMessage(ChatColor.RED + "[Herobrine] Command List (hover over commands for more info)");
for (String v : helpMessage) { for (String v : helpMessage) {
IChatBaseComponent help = ChatSerializer.a("{\"text\":\"\",\"extra\":[{\"text\":\"" + v + if(player.hasPermission("herobrine." + permissionNode.get(v))) {
"\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"" + helpMessageDesc.get(v) + "\"}}]}"); IChatBaseComponent help = ChatSerializer.a("{\"text\":\"\",\"extra\":[{\"text\":\"" + v +
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutChat(help)); "\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"" + helpMessageDesc.get(v) + "\"}}]}");
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutChat(help));
}
} }
} }