From b1c2795289313c3fca8b11e9e6efe523b3b335df Mon Sep 17 00:00:00 2001 From: Intelli Date: Thu, 10 Feb 2022 20:36:38 -0700 Subject: [PATCH] Fixed "coreprotect.inspect" permission not being checked at the time of inspection (fixes #133) --- .../listener/entity/HangingBreakByEntityListener.java | 5 +++++ .../listener/player/ArmorStandManipulateListener.java | 5 +++++ .../listener/player/PlayerInteractListener.java | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java b/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java index ddcab09..53d60cc 100755 --- a/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java +++ b/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java @@ -33,6 +33,11 @@ public final class HangingBreakByEntityListener extends Queue implements Listene class BasicThread implements Runnable { @Override public void run() { + if (!player.hasPermission("coreprotect.inspect")) { + Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); + ConfigHandler.inspecting.put(player.getName(), false); + return; + } if (ConfigHandler.converterRunning) { Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); return; diff --git a/src/main/java/net/coreprotect/listener/player/ArmorStandManipulateListener.java b/src/main/java/net/coreprotect/listener/player/ArmorStandManipulateListener.java index e4c6597..a83e097 100644 --- a/src/main/java/net/coreprotect/listener/player/ArmorStandManipulateListener.java +++ b/src/main/java/net/coreprotect/listener/player/ArmorStandManipulateListener.java @@ -53,6 +53,11 @@ public final class ArmorStandManipulateListener extends Queue implements Listene class BasicThread implements Runnable { @Override public void run() { + if (!finalPlayer.hasPermission("coreprotect.inspect")) { + Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); + ConfigHandler.inspecting.put(finalPlayer.getName(), false); + return; + } if (ConfigHandler.converterRunning) { Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); return; diff --git a/src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java b/src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java index 7d3c805..f3b1b65 100755 --- a/src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java +++ b/src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java @@ -69,6 +69,12 @@ public final class PlayerInteractListener extends Queue implements Listener { return; } + if (!player.hasPermission("coreprotect.inspect")) { + Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); + ConfigHandler.inspecting.put(player.getName(), false); + return; + } + if (event.getAction().equals(Action.LEFT_CLICK_BLOCK)) { BlockState checkBlock = event.getClickedBlock().getState(); int x = checkBlock.getX(); @@ -278,8 +284,8 @@ public final class PlayerInteractListener extends Queue implements Listener { if (ConfigHandler.lookupThrottle.get(player.getName()) != null) { Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName()); if ((boolean) lookupThrottle[0] || (System.currentTimeMillis() - (long) lookupThrottle[1]) < 100) { - Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); - return; + Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); + return; } }