From abb9329b1b8379a8d71b49da7ba697081c8f6ac1 Mon Sep 17 00:00:00 2001 From: pop4959 Date: Wed, 30 Jun 2021 22:47:58 -0700 Subject: [PATCH] Add "worldborder.allowbypass" permission (#10) While I was making the other PR I thought I might as well do this for @Prof-Bloodstone. Tested and works as expected. The perm is `worldborder.allowbypass` since `worldborder.bypass` is already used for the command. Closes #8 --- src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java | 2 +- src/main/resources/plugin.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java b/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java index 24aaf6bc..00cd2b95 100644 --- a/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java +++ b/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java @@ -55,7 +55,7 @@ public static Location checkPlayer(Player player, Location targetLoc, boolean re return null; // if player is in bypass list (from bypass command), allow them beyond border; also ignore players currently being handled already - if (Config.isPlayerBypassing(player.getUniqueId()) || handlingPlayers.contains(player.getName().toLowerCase())) + if (Config.isPlayerBypassing(player.getUniqueId()) || player.hasPermission("worldborder.allowbypass") || handlingPlayers.contains(player.getName().toLowerCase())) return null; // tag this player as being handled so we can't get stuck in a loop due to Bukkit currently sometimes repeatedly providing incorrect location through teleport event diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index b71a2b7c..89419419 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -160,3 +160,6 @@ permissions: worldborder.wshape: description: Can set an overriding border shape for a single world default: op + worldborder.allowbypass: + description: Can allow a player to bypass the world border + default: false