From 443e083f23fd7965fa13cc7602b3a507b902cbb7 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Thu, 15 Sep 2011 09:12:24 -0500 Subject: [PATCH] Bugfix release 1.4.9: material protection (interaction with doors, chests, etc.) was being incorrectly triggered in wilderness, war zones, and safe zones --- .../factions/listeners/FactionsPlayerListener.java | 7 ++++++- src/plugin.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 9762bf2f..ca7d67a4 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -347,7 +347,12 @@ public class FactionsPlayerListener extends PlayerListener{ Material material = block.getType(); FLocation loc = new FLocation(block); Faction otherFaction = Board.getFactionAt(loc); - + + // no door/chest/whatever protection in wilderness, war zones, or safe zones + if (!otherFaction.isNormal()) { + return true; + } + // We only care about some material types. if (otherFaction.hasPlayersOnline()){ if ( ! Conf.territoryProtectedMaterials.contains(material)) { diff --git a/src/plugin.yml b/src/plugin.yml index d7117314..b9d7a0cc 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: Factions -version: 1.4.8 +version: 1.4.9 main: com.massivecraft.factions.Factions softdepend: - Permissions