Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added /IgnoreClaims advertisement to animals.

Browse Source 
For both attacking and right-click interaction.
This commit is contained in:
ryanhamshire 2014-10-19 13:26:57 -07:00
parent ca6024e151
commit 682ec35503
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -552,7 +552,11 @@ class EntityEventHandler implements Listener
//kill the arrow to avoid infinite bounce between crowded together animals //kill the arrow to avoid infinite bounce between crowded together animals
if(arrow != null) arrow.remove(); 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 //cache claim for later
@ -635,7 +639,11 @@ class EntityEventHandler implements Listener
if(noContainersReason != null) if(noContainersReason != null)
{ {
event.setCancelled(true); 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 //cache claim for later

7
src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -824,8 +824,11 @@ class PlayerEventHandler implements Listener
{ {
if(claim.allowContainers(player) != null) if(claim.allowContainers(player) != null)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); String message = GriefPrevention.instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName());
event.setCancelled(true); if(player.hasPermission("griefprevention.ignoreclaims"))
message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement);
GriefPrevention.sendMessage(player, TextMode.Err, message);
event.setCancelled(true);
} }
} }
} }