From 71412a12c290f6fff751594964beca2d9297839a Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Tue, 2 Dec 2014 14:37:36 -0800 Subject: [PATCH] Protected armor stands. --- src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 4 ++-- src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index a9aff8b..3db9d3b 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -453,8 +453,8 @@ class EntityEventHandler implements Listener //don't track in worlds where claims are not enabled if(!GriefPrevention.instance.claimsEnabledForWorld(event.getEntity().getWorld())) return; - //if the damaged entity is a claimed item frame, the damager needs to be a player with container trust in the claim - if(subEvent.getEntityType() == EntityType.ITEM_FRAME) + //if the damaged entity is a claimed item frame or armor stand, the damager needs to be a player with container trust in the claim + if(subEvent.getEntityType() == EntityType.ITEM_FRAME || subEvent.getEntityType() == EntityType.ARMOR_STAND) { //decide whether it's claimed Claim cachedClaim = null; diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index f17ecb6..887feb6 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -42,6 +42,7 @@ import org.bukkit.entity.Animals; import org.bukkit.entity.Boat; import org.bukkit.entity.Creature; import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; import org.bukkit.entity.Hanging; import org.bukkit.entity.Horse; import org.bukkit.entity.Player; @@ -801,8 +802,8 @@ class PlayerEventHandler implements Listener //allow horse protection to be overridden to allow management from other plugins if (!GriefPrevention.instance.config_claims_protectHorses && entity instanceof Horse) return; - //don't allow interaction with item frames in claimed areas without build permission - if(entity instanceof Hanging) + //don't allow interaction with item frames or armor stands in claimed areas without build permission + if(entity.getType() == EntityType.ARMOR_STAND || entity instanceof Hanging) { String noBuildReason = GriefPrevention.instance.allowBuild(player, entity.getLocation(), Material.ITEM_FRAME); if(noBuildReason != null)