From 5e2f128a8d88a28e7191ecce609808f994057ca6 Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Wed, 19 Sep 2018 00:36:21 -0700 Subject: [PATCH] sieged claims are never pvp-safe zones. Fixes #199 --- .../java/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java index fb405d0..882e437 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -3656,6 +3656,8 @@ public class GriefPrevention extends JavaPlugin public boolean claimIsPvPSafeZone(Claim claim) { + if (claim.siegeData != null) + return false; return claim.isAdminClaim() && claim.parent == null && GriefPrevention.instance.config_pvp_noCombatInAdminLandClaims || claim.isAdminClaim() && claim.parent != null && GriefPrevention.instance.config_pvp_noCombatInAdminSubdivisions || !claim.isAdminClaim() && GriefPrevention.instance.config_pvp_noCombatInPlayerLandClaims;