From b5236aed9a3844dfcd696870bd65024325ea4aff Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Fri, 12 Aug 2016 20:58:51 -0700 Subject: [PATCH] Permission to teleport around besieged areas. Intended for administrators. Defaults on for server ops. --- plugin.yml | 6 +++++- src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 69b24ae..f8404ec 100644 --- a/plugin.yml +++ b/plugin.yml @@ -245,6 +245,7 @@ permissions: griefprevention.seeinactivity: true griefprevention.eavesdropimmune: true griefprevention.deleteclaimsinworld: true + griefprevention.siegeteleport: true griefprevention.siegeimmune: description: Makes a player immune to /Siege. default: op @@ -352,4 +353,7 @@ permissions: default: false griefprevention.mostaccrued: description: Players with this permission can accrue more claim blocks (limit specified in the config file). - default: false \ No newline at end of file + default: false + griefprevention.siegeteleport: + description: Players with this permission can teleport into and out of besieged areas. + default: op \ No newline at end of file diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index b458970..27086f8 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -1071,6 +1071,9 @@ class PlayerEventHandler implements Listener //these rules only apply to siege worlds only if(!GriefPrevention.instance.config_siege_enabledWorlds.contains(player.getWorld())) return; + //these rules do not apply to admins + if(player.hasPermission("griefprevention.siegeteleport")) return; + Location source = event.getFrom(); Claim sourceClaim = this.dataStore.getClaimAt(source, false, playerData.lastClaim); if(sourceClaim != null && sourceClaim.siegeData != null)