Fixes a bug, when players in creative menu still receive a message ab…

…out missing items.
BentoBoxWorld · Jan 26, 2022 · 3b4d1c8 · 3b4d1c8
1 parent dd145a7
commit 3b4d1c8
Showing 1 changed file with 41 additions and 14 deletions.
diff --git a/src/main/java/world/bentobox/biomes/tasks/BiomeUpdateHelper.java b/src/main/java/world/bentobox/biomes/tasks/BiomeUpdateHelper.java
@@ -564,18 +564,15 @@ private void withdrawMoney(CompletableFuture<Boolean> changeBiomeStage, double m
                 this.callerUser.getTranslation(Constants.ERRORS + "could-not-remove-money"));
             this.addon.logError("Economy Addon not provided.");
             changeBiomeStage.complete(false);
+            return;
         }
 
         if (this.addon.getSettings().isUseBankAccount() && this.addon.isBankProvided())
         {
             BankManager bankManager = this.addon.getBankAddon().getBankManager();
             bankManager.withdraw(this.callerUser, this.island, new Money(money), TxType.WITHDRAW).
                 thenAccept(response -> {
-                    if (response == BankResponse.SUCCESS)
-                    {
-                        changeBiomeStage.complete(true);
-                    }
-                    else
+                    if (response != BankResponse.SUCCESS)
                     {
                         Utils.sendMessage(this.callerUser,
                             this.callerUser.getTranslation(Constants.ERRORS + "could-not-remove-money"));
@@ -587,11 +584,7 @@ private void withdrawMoney(CompletableFuture<Boolean> changeBiomeStage, double m
         {
             EconomyResponse withdraw = this.addon.getVaultHook().withdraw(this.callerUser, money);
 
-            if (withdraw.transactionSuccess())
-            {
-                changeBiomeStage.complete(true);
-            }
-            else
+            if (!withdraw.transactionSuccess())
             {
                 // Something went wrong on withdraw.
 
@@ -618,7 +611,7 @@ private void withdrawItems(CompletableFuture<Boolean> changeBiomeStage,
         if (this.callerUser.getPlayer().getGameMode() == GameMode.CREATIVE)
         {
             // No point to check items from creative inventory.
-            changeBiomeStage.complete(true);
+            return;
         }
 
         for (ItemStack required : requiredItemList)
@@ -673,11 +666,9 @@ private void withdrawItems(CompletableFuture<Boolean> changeBiomeStage,
                     " from player's inventory!");
 
                 changeBiomeStage.complete(false);
+                return;
             }
         }
-
-        // Complete at the end.
-        changeBiomeStage.complete(true);
     }
 
 
@@ -695,6 +686,12 @@ private void withdrawPerBlock(CompletableFuture<Boolean> changeBiomeStage)
             this.withdrawMoney(changeBiomeStage, this.biome.getCost() * blockCount);
         }
 
+        if (changeBiomeStage.isDone())
+        {
+            // Return if already processed.
+            return;
+        }
+
         if (!this.biome.getItemCost().isEmpty())
         {
             List<ItemStack> itemCost = Utils.groupEqualItems(this.biome.getItemCost(), Collections.emptySet());
@@ -703,6 +700,12 @@ private void withdrawPerBlock(CompletableFuture<Boolean> changeBiomeStage)
             this.withdrawItems(changeBiomeStage, itemCost, Collections.emptySet());
         }
 
+        if (changeBiomeStage.isDone())
+        {
+            // Return if already processed.
+            return;
+        }
+
         changeBiomeStage.complete(true);
     }
 
@@ -722,6 +725,12 @@ private void withdrawPerUsage(CompletableFuture<Boolean> changeBiomeStage)
                 this.biome.getCost() + increment * this.biome.getCost());
         }
 
+        if (changeBiomeStage.isDone())
+        {
+            // Return if already processed.
+            return;
+        }
+
         if (!this.biome.getItemCost().isEmpty())
         {
             List<ItemStack> itemCost = Utils.groupEqualItems(this.biome.getItemCost(), Collections.emptySet());
@@ -733,6 +742,12 @@ private void withdrawPerUsage(CompletableFuture<Boolean> changeBiomeStage)
                 Collections.emptySet());
         }
 
+        if (changeBiomeStage.isDone())
+        {
+            // Return if already processed.
+            return;
+        }
+
         changeBiomeStage.complete(true);
     }
 
@@ -749,13 +764,25 @@ private void withdrawStatic(CompletableFuture<Boolean> changeBiomeStage)
             this.withdrawMoney(changeBiomeStage, this.biome.getCost());
         }
 
+        if (changeBiomeStage.isDone())
+        {
+            // Return if already processed.
+            return;
+        }
+
         if (!this.biome.getItemCost().isEmpty())
         {
             this.withdrawItems(changeBiomeStage,
                 Utils.groupEqualItems(this.biome.getItemCost(), Collections.emptySet()),
                 Collections.emptySet());
         }
 
+        if (changeBiomeStage.isDone())
+        {
+            // Return if already processed.
+            return;
+        }
+
         changeBiomeStage.complete(true);
     }