From 7b32649e69da4dacf2d383ebf20fd2224951f5d5 Mon Sep 17 00:00:00 2001 From: cswhite2000 Date: Mon, 8 Jan 2018 19:44:11 -0800 Subject: [PATCH] Only show silent punishments to staff (#68) --- .../oc/commons/bukkit/punishment/PunishmentEnforcer.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java index 53ceafd..a0b2733 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java @@ -123,7 +123,11 @@ public class PunishmentEnforcer implements Enableable, MessageListener { public boolean viewable(CommandSender sender, Punishment punishment, boolean announced) { if(viewByIdentity(sender, punishment)) { if(announced) { - return viewByType(sender, punishment) && viewBySetting(sender, punishment) && viewByIdentity(sender, punishment) && viewByRecord(sender, punishment); + return viewByType(sender, punishment) + && viewBySetting(sender, punishment) + && viewByIdentity(sender, punishment) + && viewByRecord(sender, punishment) + && viewBySilent(sender, punishment); } else { return viewByLookup(sender, punishment); } @@ -171,4 +175,7 @@ public class PunishmentEnforcer implements Enableable, MessageListener { return sender.hasPermission(punishment.stale() ? LOOK_UP_STALE : LOOK_UP); } + private boolean viewBySilent(CommandSender sender, Punishment punishment) { + return !punishment.silent() || sender.hasPermission(Permissions.STAFF); + } }