From 682ec3550377cb26b8405dfad75af2d1ca8f3711 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Sun, 19 Oct 2014 13:26:57 -0700 Subject: [PATCH] Added /IgnoreClaims advertisement to animals. For both attacking and right-click interaction. --- .../GriefPrevention/EntityEventHandler.java | 12 ++++++++++-- .../GriefPrevention/PlayerEventHandler.java | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index ce2d039..adc3e93 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -552,7 +552,11 @@ class EntityEventHandler implements Listener //kill the arrow to avoid infinite bounce between crowded together animals if(arrow != null) arrow.remove(); - GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); + String message = GriefPrevention.instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName()); + if(attacker.hasPermission("griefprevention.ignoreclaims")) + message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); + GriefPrevention.sendMessage(attacker, TextMode.Err, message); + event.setCancelled(true); } //cache claim for later @@ -635,7 +639,11 @@ class EntityEventHandler implements Listener if(noContainersReason != null) { event.setCancelled(true); - GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); + String message = GriefPrevention.instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName()); + if(attacker.hasPermission("griefprevention.ignoreclaims")) + message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); + GriefPrevention.sendMessage(attacker, TextMode.Err, message); + event.setCancelled(true); } //cache claim for later diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 45c78fb..b4ae1e8 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -824,8 +824,11 @@ class PlayerEventHandler implements Listener { if(claim.allowContainers(player) != null) { - GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); - event.setCancelled(true); + String message = GriefPrevention.instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName()); + if(player.hasPermission("griefprevention.ignoreclaims")) + message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); + GriefPrevention.sendMessage(player, TextMode.Err, message); + event.setCancelled(true); } } }