From 11bd632b155db366a2587eaea0d313780a30b58f Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Tue, 8 Sep 2015 12:55:42 -0500
Subject: [PATCH] Add option to disable explosions in peaceful territory from
#369.
---
src/main/java/com/massivecraft/factions/Conf.java | 1 +
.../massivecraft/factions/listeners/FactionsEntityListener.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java
index f15e1116..613e3c01 100644
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/src/main/java/com/massivecraft/factions/Conf.java
@@ -125,6 +125,7 @@ public class Conf {
public static boolean peacefulTerritoryDisablePVP = true;
public static boolean peacefulTerritoryDisableMonsters = false;
+ public static boolean peacefulTerritoryDisableBoom = false;
public static boolean peacefulMembersDisablePowerLoss = true;
public static boolean permanentFactionsDisableLeaderPromotion = false;
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 842bc91b..0385696c 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -141,7 +141,7 @@ public class FactionsEntityListener implements Listener {
Entity boomer = event.getEntity();
Faction faction = Board.getInstance().getFactionAt(new FLocation(loc));
- if (faction.noExplosionsInTerritory()) {
+ if (faction.noExplosionsInTerritory() || (faction.isPeaceful() && Conf.peacefulTerritoryDisableBoom)) {
// faction is peaceful and has explosions set to disabled
event.setCancelled(true);
return;