diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index b87a800..d90cf4f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -6,28 +6,36 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -public class CommandSpy extends FreedomService { +public class CommandSpy extends FreedomService +{ - public CommandSpy(TotalFreedomMod plugin) { + public CommandSpy(TotalFreedomMod plugin) + { super(plugin); } @Override - protected void onStart() { + protected void onStart() + { } @Override - protected void onStop() { + protected void onStop() + { } @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { - if (plugin.al.isAdmin(event.getPlayer())) { + public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) + { + if (plugin.al.isAdmin(event.getPlayer())) + { return; } - for (Player player : server.getOnlinePlayers()) { - if (plugin.al.isAdmin(player) && plugin.pl.getPlayer(player).cmdspyEnabled()) { + for (Player player : server.getOnlinePlayers()) + { + if (plugin.al.isAdmin(player) && plugin.pl.getPlayer(player).cmdspyEnabled()) + { FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage()); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java index befd5e9..bd469ed 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java @@ -108,6 +108,14 @@ public class BlockBlocker extends FreedomService } break; } + case STRUCTURE_BLOCK: + case STRUCTURE_VOID: + { + player.sendMessage(ChatColor.GRAY + "Structure blocks are disabled."); + + event.setCancelled(true); + break; + } } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java index e40ad22..66dcab1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java @@ -9,12 +9,16 @@ import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) @CommandParameters(description = "Shows all banned player names. Superadmins may optionally use 'purge' to clear the list.", usage = "/ [purge]") -public class Command_banlist extends FreedomCommand { +public class Command_banlist extends FreedomCommand +{ @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (args.length > 0) { - if (args[0].equalsIgnoreCase("purge")) { + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length > 0) + { + if (args[0].equalsIgnoreCase("purge")) + { checkRank(Rank.SENIOR_ADMIN); FUtil.adminAction(sender.getName(), "Purging the ban list", true);