From 575df4f8a59ec3a8805b1a20a2775e5943f2e500 Mon Sep 17 00:00:00 2001 From: David Precious Date: Wed, 6 Jul 2016 16:56:51 +0100 Subject: [PATCH 1/3] 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, From f33a732d0585927f6572126b9b8c4ce3ebdc0f70 Mon Sep 17 00:00:00 2001 From: smc87 Date: Sun, 5 Jun 2016 01:13:30 +0100 Subject: [PATCH 2/3] Added .getName() 's ? --- src/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index 7bd36ae..e360027 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -1695,7 +1695,7 @@ public class GriefPrevention extends JavaPlugin //if no parameter, just tell player cost per block and balance if(args.length != 1) { - GriefPrevention.sendMessage(player, TextMode.Info, Messages.BlockPurchaseCost, String.valueOf(GriefPrevention.instance.config_economy_claimBlocksPurchaseCost), String.valueOf(GriefPrevention.economy.getBalance(player))); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.BlockPurchaseCost, String.valueOf(GriefPrevention.instance.config_economy_claimBlocksPurchaseCost), String.valueOf(GriefPrevention.economy.getBalance(player.getName()))); return false; } @@ -1720,7 +1720,7 @@ public class GriefPrevention extends JavaPlugin } //if the player can't afford his purchase, send error message - double balance = economy.getBalance(player); + double balance = economy.getBalance(player.getName()); double totalCost = blockCount * GriefPrevention.instance.config_economy_claimBlocksPurchaseCost; if(totalCost > balance) { @@ -1731,7 +1731,7 @@ public class GriefPrevention extends JavaPlugin else { //withdraw cost - economy.withdrawPlayer(player, totalCost); + economy.withdrawPlayer(player.getName(), totalCost); //add blocks playerData.setBonusClaimBlocks(playerData.getBonusClaimBlocks() + blockCount); @@ -1806,7 +1806,7 @@ public class GriefPrevention extends JavaPlugin { //compute value and deposit it double totalValue = blockCount * GriefPrevention.instance.config_economy_claimBlocksSellValue; - economy.depositPlayer(player, totalValue); + economy.depositPlayer(player.getName(), totalValue); //subtract blocks playerData.setBonusClaimBlocks(playerData.getBonusClaimBlocks() - blockCount); From f2dd7f6a8bfeb8e43b66cbcd4c99e6750c7d5522 Mon Sep 17 00:00:00 2001 From: David Precious Date: Wed, 6 Jul 2016 16:57:59 +0100 Subject: [PATCH 3/3] Bah, now with less muppetry. Silly typo. --- src/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index e360027..5846661 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -2402,7 +2402,7 @@ public class GriefPrevention extends JavaPlugin // First off, you cannot siege yourself, that's just // silly: if (attacker.getName().equals( defender.getName() )) { - GriefPrevention.sendMessage(player, TextMode.Err, Messages,NoSiegeYourself); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoSiegeYourself); return true; }