From 575df4f8a59ec3a8805b1a20a2775e5943f2e500 Mon Sep 17 00:00:00 2001 From: David Precious Date: Wed, 6 Jul 2016 16:56:51 +0100 Subject: [PATCH] Don't allow someone to attempt to siege themselves. --- src/me/ryanhamshire/GriefPrevention/DataStore.java | 1 + src/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 7 +++++++ src/me/ryanhamshire/GriefPrevention/Messages.java | 1 + 3 files changed, 9 insertions(+) diff --git a/src/me/ryanhamshire/GriefPrevention/DataStore.java b/src/me/ryanhamshire/GriefPrevention/DataStore.java index cb35497..5f1f041 100644 --- a/src/me/ryanhamshire/GriefPrevention/DataStore.java +++ b/src/me/ryanhamshire/GriefPrevention/DataStore.java @@ -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.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.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.AlreadyUnderSiegeArea, "That area is already under siege. Join the party!", null); this.addDefault(defaults, Messages.NoSiegeAdminClaim, "Siege is disabled in this area.", null); diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index 7401ba2..7bd36ae 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -2398,6 +2398,13 @@ public class GriefPrevention extends JavaPlugin { 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 if(defender.hasPermission("griefprevention.siegeimmune")) diff --git a/src/me/ryanhamshire/GriefPrevention/Messages.java b/src/me/ryanhamshire/GriefPrevention/Messages.java index 6c52435..abcbeb6 100644 --- a/src/me/ryanhamshire/GriefPrevention/Messages.java +++ b/src/me/ryanhamshire/GriefPrevention/Messages.java @@ -66,6 +66,7 @@ public enum Messages AlreadySieging, NotSiegableThere, SiegeTooFarAway, + NoSiegeYourself, NoSiegeDefenseless, AlreadyUnderSiegePlayer, AlreadyUnderSiegeArea,