From 514b0e594904d4d65400234081ff3557628f63d9 Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Sun, 20 Nov 2016 17:40:26 -0800 Subject: [PATCH] Add negative value check when accruing claim blocks to prevent plugins from doing nasties --- .../ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java | 5 +++-- .../GriefPrevention/events/AccrueClaimBlocksEvent.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java b/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java index 0baadae..538134c 100644 --- a/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java +++ b/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java @@ -85,8 +85,9 @@ class DeliverClaimBlocksTask implements Runnable GriefPrevention.AddLogEntry(player.getName() + " claim block delivery was canceled by another plugin.", CustomLogEntryTypes.Debug, true); return; } - - playerData.accrueBlocks(event.getBlocksToAccrue()); + accrualRate = event.getBlocksToAccrue(); + if(accrualRate < 0) accrualRate = 0; + playerData.accrueBlocks(accrualRate); GriefPrevention.AddLogEntry("Delivering " + event.getBlocksToAccrue() + " blocks to " + player.getName(), CustomLogEntryTypes.Debug, true); //intentionally NOT saving data here to reduce overall secondary storage access frequency diff --git a/src/me/ryanhamshire/GriefPrevention/events/AccrueClaimBlocksEvent.java b/src/me/ryanhamshire/GriefPrevention/events/AccrueClaimBlocksEvent.java index e9fd44c..e5baff9 100644 --- a/src/me/ryanhamshire/GriefPrevention/events/AccrueClaimBlocksEvent.java +++ b/src/me/ryanhamshire/GriefPrevention/events/AccrueClaimBlocksEvent.java @@ -29,7 +29,6 @@ public class AccrueClaimBlocksEvent extends Event public AccrueClaimBlocksEvent(Player player, int blocksToAccrue) { this.player = player; - if(blocksToAccrue < 0) blocksToAccrue = 1; this.blocksToAccrue = blocksToAccrue / 6; }