Resolvido problema ao transferir chave

Resolvido problema com placeholder
ArmaRealms · Mar 6, 2024 · 42d25ea · 42d25ea
1 parent a35f040
commit 42d25ea
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java b/paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java
@@ -69,9 +69,9 @@ public void viewOthers(CommandSender sender, @Suggestion("online-players") Playe
         placeholders.put("%player%", target.getName());
         placeholders.put("%crates_opened%", String.valueOf(this.userManager.getTotalCratesOpened(target.getUniqueId())));
 
-        String header = Messages.other_player_no_keys_header.getMessage(placeholders, sender instanceof Player ? (Player) sender : null);
+        String header = Messages.other_player_no_keys_header.getMessage(placeholders, sender instanceof Player player ?  player : null);
 
-        String otherPlayer = Messages.other_player_no_keys.getMessage("%player%", target.getName(), sender instanceof Player ? (Player) sender : null);
+        String otherPlayer = Messages.other_player_no_keys.getMessage("%player%", target.getName(), sender instanceof Player player ? player : null);
 
         getKeys(target, sender, header, otherPlayer);
     }
@@ -84,21 +84,25 @@ public void onPlayerTransferKeys(Player sender, @Suggestion("crates") String cra
         // If the crate is menu or null. we return
         if (crate == null || crate.getCrateType() == CrateType.menu) {
             sender.sendMessage(Messages.not_a_crate.getMessage("%crate%", crateName, sender));
-
             return;
         }
 
         // If it's the same player, we return.
         if (player.getUniqueId().toString().equalsIgnoreCase(sender.getUniqueId().toString())) {
             sender.sendMessage(Messages.same_player.getMessage(sender));
-
             return;
         }
 
-        // If they don't have enough keys, we return.
-        if (this.userManager.getVirtualKeys(sender.getUniqueId(), crate.getName()) <= amount) {
-            sender.sendMessage(Messages.transfer_not_enough_keys.getMessage("%crate%", crate.getName(), sender));
+        Map<String, String> placeholders = new HashMap<>();
+
+        placeholders.put("%crate%", crate.getName());
+        placeholders.put("%key%", crate.getKeyName());
+        placeholders.put("%amount%", String.valueOf(amount));
+        placeholders.put("%player%", player.getName());
 
+        // If they don't have enough keys, we return.
+        if (this.userManager.getVirtualKeys(sender.getUniqueId(), crate.getName()) < amount) {
+            sender.sendMessage(Messages.transfer_not_enough_keys.getMessage(placeholders, sender));
             return;
         }
 
@@ -111,18 +115,11 @@ public void onPlayerTransferKeys(Player sender, @Suggestion("crates") String cra
         this.userManager.takeKeys(amount, sender.getUniqueId(), crate.getName(), KeyType.virtual_key, false);
         this.userManager.addKeys(amount, player.getUniqueId(), crate.getName(), KeyType.virtual_key);
 
-        Map<String, String> placeholders = new HashMap<>();
-
-        placeholders.put("%crate%", crate.getName());
-        placeholders.put("%key%", crate.getKeyName());
-        placeholders.put("%amount%", String.valueOf(amount));
-        placeholders.put("%player%", player.getName());
-
         sender.sendMessage(Messages.transfer_sent_keys.getMessage(placeholders, sender));
 
         placeholders.put("%player%", sender.getName());
 
-        player.sendMessage(Messages.transfer_received_keys.getMessage("%player%", sender.getName(), player));
+        player.sendMessage(Messages.transfer_received_keys.getMessage(placeholders, player));
 
         EventManager.logKeyEvent(player, sender, crate, KeyType.virtual_key, EventManager.KeyEventType.KEY_EVENT_RECEIVED, this.config.getProperty(ConfigKeys.log_to_file), this.config.getProperty(ConfigKeys.log_to_console));
     }