Fixed detection of removal of generator rates, warp limits and more

BG-Software-LLC · Oct 29, 2022 · d96ae8e · d96ae8e
1 parent a18bbfa
commit d96ae8e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/admin/CmdAdminAddWarpsLimit.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/admin/CmdAdminAddWarpsLimit.java
@@ -67,7 +67,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, Superio
 
         int limit = arguments.getNumber();
 
-        if (limit < 0) {
+        if (limit <= 0) {
             Message.INVALID_AMOUNT.send(sender);
             return;
         }

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/admin/CmdAdminSetRoleLimit.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/admin/CmdAdminSetRoleLimit.java
@@ -86,7 +86,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, Superio
         boolean anyIslandChanged = false;
 
         for (Island island : islands) {
-            if (limit < 0) {
+            if (limit <= 0) {
                 if (plugin.getEventsBus().callIslandRemoveRoleLimitEvent(sender, island, playerRole)) {
                     anyIslandChanged = true;
                     island.removeRoleLimit(playerRole);

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/module/bank/commands/CmdAdminWithdraw.java b/src/main/java/com/bgsoftware/superiorskyblock/module/bank/commands/CmdAdminWithdraw.java
@@ -68,7 +68,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, Superio
         } catch (IllegalArgumentException ignored) {
         }
 
-        if (amount.compareTo(BigDecimal.ZERO) < 0) {
+        if (amount.compareTo(BigDecimal.ZERO) <= 0) {
             Message.INVALID_AMOUNT.send(sender, args[3]);
             return;
         }

diff --git a/...java/com/bgsoftware/superiorskyblock/module/generators/commands/CmdAdminAddGenerator.java b/...java/com/bgsoftware/superiorskyblock/module/generators/commands/CmdAdminAddGenerator.java
@@ -82,7 +82,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, Superio
 
         int amount = arguments.getNumber();
 
-        if (percentage && (amount < 0 || amount > 100)) {
+        if (amount == 0 || (percentage && (amount < 0 || amount > 100))) {
             Message.INVALID_PERCENTAGE.send(sender);
             return;
         }
@@ -105,7 +105,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, Superio
             } else {
                 int generatorRate = island.getGeneratorAmount(material, environment) + amount;
 
-                if (generatorRate < 0) {
+                if (generatorRate <= 0) {
                     if (!plugin.getEventsBus().callIslandRemoveGeneratorRateEvent(sender, island, material, environment))
                         continue;
 

diff --git a/...java/com/bgsoftware/superiorskyblock/module/generators/commands/CmdAdminSetGenerator.java b/...java/com/bgsoftware/superiorskyblock/module/generators/commands/CmdAdminSetGenerator.java
@@ -102,7 +102,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, Superio
                     continue;
                 }
             } else {
-                if (amount < 0) {
+                if (amount <= 0) {
                     if (!plugin.getEventsBus().callIslandRemoveGeneratorRateEvent(sender, island, material, environment))
                         continue;