check denied players: allow trusted or helper players

ovisdevelopment · Dec 29, 2024 · 3ad7098 · 3ad7098
1 parent 7609cd3
commit 3ad7098
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/ovis/futureplots/listener/plot/PlayerMove.java b/src/main/java/ovis/futureplots/listener/plot/PlayerMove.java
@@ -50,9 +50,14 @@ public void on(PlayerMoveEvent event) {
             final Plot plotTo = plotManager.getMergedPlot(event.getTo().getFloorX(), event.getTo().getFloorZ());
 
             if(plotTo != null) {
-                if(!plotTo.isOwner(player.getUniqueId()) && (plotTo.isDenied(player.getUniqueId()) || plotTo.isDenied(Utils.UUID_EVERYONE)) && !player.hasPermission("plot.admin.bypass.deny")) {
-                    event.setCancelled(true);
-                    return;
+                if(plotTo.isDenied(player.getUniqueId()) || plotTo.isDenied(Utils.UUID_EVERYONE)) {
+                    Player owner = this.plugin.getServer().getPlayer(this.plugin.getCorrectName(plotTo.getOwner()));
+                    if (!plotTo.isOwner(player.getUniqueId()) && !plotTo.isTrusted(player.getUniqueId()) && !player.hasPermission("plot.admin.bypass.deny")) {
+                        if ((plotTo.isHelper(player.getUniqueId()) && owner == null) || !plotTo.isHelper(player.getUniqueId())) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
                 }
 
                 if(plotFrom == null) {