Don't allow someone to attempt to siege themselves.

This commit is contained in:
David Precious 2016-07-06 16:56:51 +01:00
parent 9fd29a54ae
commit 575df4f8a5
3 changed files with 9 additions and 0 deletions

View File

@ -1434,6 +1434,7 @@ public abstract class DataStore
this.addDefault(defaults, Messages.AlreadyUnderSiegePlayer, "{0} is already under siege. Join the party!", "0: defending player"); this.addDefault(defaults, Messages.AlreadyUnderSiegePlayer, "{0} is already under siege. Join the party!", "0: defending player");
this.addDefault(defaults, Messages.NotSiegableThere, "{0} isn't protected there.", "0: defending player"); this.addDefault(defaults, Messages.NotSiegableThere, "{0} isn't protected there.", "0: defending player");
this.addDefault(defaults, Messages.SiegeTooFarAway, "You're too far away to siege.", null); this.addDefault(defaults, Messages.SiegeTooFarAway, "You're too far away to siege.", null);
this.addDefault(defaults, Messages.NoSiegeYourself, "You cannot siege yourself, don't be silly", null);
this.addDefault(defaults, Messages.NoSiegeDefenseless, "That player is defenseless. Go pick on somebody else.", null); this.addDefault(defaults, Messages.NoSiegeDefenseless, "That player is defenseless. Go pick on somebody else.", null);
this.addDefault(defaults, Messages.AlreadyUnderSiegeArea, "That area is already under siege. Join the party!", null); this.addDefault(defaults, Messages.AlreadyUnderSiegeArea, "That area is already under siege. Join the party!", null);
this.addDefault(defaults, Messages.NoSiegeAdminClaim, "Siege is disabled in this area.", null); this.addDefault(defaults, Messages.NoSiegeAdminClaim, "Siege is disabled in this area.", null);

View File

@ -2399,6 +2399,13 @@ public class GriefPrevention extends JavaPlugin
return false; return false;
} }
// First off, you cannot siege yourself, that's just
// silly:
if (attacker.getName().equals( defender.getName() )) {
GriefPrevention.sendMessage(player, TextMode.Err, Messages,NoSiegeYourself);
return true;
}
//victim must not have the permission which makes him immune to siege //victim must not have the permission which makes him immune to siege
if(defender.hasPermission("griefprevention.siegeimmune")) if(defender.hasPermission("griefprevention.siegeimmune"))
{ {

View File

@ -66,6 +66,7 @@ public enum Messages
AlreadySieging, AlreadySieging,
NotSiegableThere, NotSiegableThere,
SiegeTooFarAway, SiegeTooFarAway,
NoSiegeYourself,
NoSiegeDefenseless, NoSiegeDefenseless,
AlreadyUnderSiegePlayer, AlreadyUnderSiegePlayer,
AlreadyUnderSiegeArea, AlreadyUnderSiegeArea,