From c4543827eb63f993b47963ffc971c814f50e2c9e Mon Sep 17 00:00:00 2001 From: bloodshot Date: Sun, 16 Feb 2020 15:35:30 -0500 Subject: [PATCH] Fix giveblocks command with negative amounts. --- .../java/com/griefdefender/command/CommandGiveBlocks.java | 5 +++++ .../java/com/griefdefender/command/CommandGiveBlocks.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandGiveBlocks.java b/bukkit/src/main/java/com/griefdefender/command/CommandGiveBlocks.java index 8a31fd9..2bad3cb 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandGiveBlocks.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandGiveBlocks.java @@ -38,6 +38,11 @@ public class CommandGiveBlocks extends BaseCommand { @Syntax(" ") @Subcommand("giveblocks") public void execute(Player src, OfflinePlayer targetPlayer, int amount) { + if (amount <= 0) { + TextAdapter.sendComponent(src, GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.COMMAND_INVALID_AMOUNT)); + return; + } + final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(src.getWorld(), src.getUniqueId()); int availableBlocks = playerData.getAccruedClaimBlocks() + playerData.getBonusClaimBlocks(); if (amount > availableBlocks) { diff --git a/sponge/src/main/java/com/griefdefender/command/CommandGiveBlocks.java b/sponge/src/main/java/com/griefdefender/command/CommandGiveBlocks.java index 2c3b32a..022a268 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandGiveBlocks.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandGiveBlocks.java @@ -37,6 +37,11 @@ public class CommandGiveBlocks extends BaseCommand { @Syntax(" ") @Subcommand("giveblocks") public void execute(Player src, User targetPlayer, int amount) { + if (amount <= 0) { + TextAdapter.sendComponent(src, GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.COMMAND_INVALID_AMOUNT)); + return; + } + final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(src.getWorld(), src.getUniqueId()); int availableBlocks = playerData.getAccruedClaimBlocks() + playerData.getBonusClaimBlocks(); if (amount > availableBlocks) {