From 6f0dcf4b293bf19d44670112dbb3b208afde33b4 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Wed, 1 Jun 2011 23:01:51 -0500 Subject: [PATCH] people with bypass permission can build in wilderness regardless of wilderness settings --- src/org/mcteam/factions/listeners/FactionsBlockListener.java | 2 +- src/org/mcteam/factions/listeners/FactionsEntityListener.java | 2 +- src/org/mcteam/factions/listeners/FactionsPlayerListener.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/mcteam/factions/listeners/FactionsBlockListener.java b/src/org/mcteam/factions/listeners/FactionsBlockListener.java index c4672d53..82ce4643 100644 --- a/src/org/mcteam/factions/listeners/FactionsBlockListener.java +++ b/src/org/mcteam/factions/listeners/FactionsBlockListener.java @@ -63,7 +63,7 @@ public class FactionsBlockListener extends BlockListener { FPlayer me = FPlayer.get(player); if (otherFaction.isNone()) { - if (!Conf.wildernessDenyBuild) { + if (!Conf.wildernessDenyBuild || Factions.hasPermAdminBypass(player)) { return true; // This is not faction territory. Use whatever you like here. } me.sendMessage("You can't "+action+" in the wilderness."); diff --git a/src/org/mcteam/factions/listeners/FactionsEntityListener.java b/src/org/mcteam/factions/listeners/FactionsEntityListener.java index 23764c73..b2072480 100644 --- a/src/org/mcteam/factions/listeners/FactionsEntityListener.java +++ b/src/org/mcteam/factions/listeners/FactionsEntityListener.java @@ -272,7 +272,7 @@ public class FactionsEntityListener extends EntityListener { FPlayer me = FPlayer.get(player); if (otherFaction.isNone()) { - if (!Conf.wildernessDenyBuild) { + if (!Conf.wildernessDenyBuild || Factions.hasPermAdminBypass(player)) { return true; // This is not faction territory. Use whatever you like here. } me.sendMessage("You can't "+action+" paintings in the wilderness."); diff --git a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java index 4ed71638..812aa441 100644 --- a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java +++ b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java @@ -190,7 +190,7 @@ public class FactionsPlayerListener extends PlayerListener{ FPlayer me = FPlayer.get(player); if (otherFaction.isNone()) { - if (!Conf.wildernessDenyUseage) { + if (!Conf.wildernessDenyUseage || Factions.hasPermAdminBypass(player)) { return true; // This is not faction territory. Use whatever you like here. } me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in the wilderness.");