From 402b94a7972052db2d0df0ed6565668aaae16448 Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Fri, 26 Jan 2024 23:38:12 +0100 Subject: [PATCH] Check if give is not negative --- TODO.md | 6 +++++- .../ovh/herisson/thevoidroad/Commands/VoidCommands.java | 2 +- .../src/main/java/ovh/herisson/thevoidroad/Voids.java | 9 ++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/TODO.md b/TODO.md index 9bd997f..6edd9b6 100644 --- a/TODO.md +++ b/TODO.md @@ -3,6 +3,10 @@ - [ ] i18n - [-] Make Discord Webhoook for item changes - [x] deathBan reset -- [ ] voids exchanges +- [x] voids exchanges - [ ] chest name - [ ] /void manage bring +- [ ] Dupe bug (respawn) -> Gamerule +- [x] /void give négatives values +- [ ] /void give afficher title + - subtitle + chat diff --git a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java index e3ca836..9c82892 100644 --- a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java +++ b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java @@ -44,7 +44,7 @@ public class VoidCommands implements CommandExecutor, TabCompleter{ case "give": if(args.length < 2) return false; Player target = Bukkit.getPlayer(args[1]); - if(target != null && sender instanceof Player ply) + if(target != null && sender instanceof Player ply && Integer.parseInt(args[2]) > 0) Voids.give(ply,target, Integer.parseInt(args[2])); break; case "event": diff --git a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Voids.java b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Voids.java index af26487..2f866d4 100644 --- a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Voids.java +++ b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Voids.java @@ -48,11 +48,10 @@ public final class Voids implements Listener{ } public static boolean give(Player giver, Player receiver, int amount){ - if(subtract(giver, amount, false)){ - add(receiver, amount); - return true; - } - return false; + if( amount < 0 || !subtract(giver, amount, false)) + return false; + add(receiver, amount); + return true; } public static HashMap scoreboard(){