Skip to content

Use local player cache for pay commands #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Javavailable wants to merge 3 commits into
base: main
Choose a base branch
from
+78 −45
Open

Use local player cache for pay commands #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bff1159
Avoid blocking UUID lookups in pay commands
Javavailable Jun 27, 2026
51b5325
Avoid blocking UUID lookups in pay commands
Javavailable Jun 27, 2026
8e85fd8
Avoid blocking UUID lookups in pay commands
Javavailable Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions ...ancyeconomy/src/main/java/com/fancyinnovations/fancyeconomy/commands/CurrencyBaseCMD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,31 +122,38 @@ public void pay(
targetName = targetPlayer.getName();
}

UUID uuid = targetPlayer != null ? targetPlayer.getUniqueId() : UUIDFetcher.getUUID(targetName);
CurrencyPlayer to;
if (targetPlayer != null) {
if (player.getUniqueId().equals(targetPlayer.getUniqueId())) {
FancyEconomy.getInstance().getTranslator()
.translate("cannot-pay-yourself")
.send(player);
return;
}

if (uuid == null) {
FancyEconomy.getInstance().getTranslator()
.translate("player-not-found")
.replace("player", targetName)
.send(player);
return;
}
to = CurrencyPlayerManager.getPlayer(targetPlayer.getUniqueId(), targetPlayer.getName());
to.setUsername(targetPlayer.getName());
} else {
to = CurrencyPlayerManager.getCachedPlayer(targetName);
if (to == null) {
FancyEconomy.getInstance().getTranslator()
.translate("player-not-found")
.replace("player", targetName)
.send(player);
return;
}

if (player.getUniqueId().equals(uuid)) {
FancyEconomy.getInstance().getTranslator()
.translate("cannot-pay-yourself")
.send(player);
return;
if (player.getUniqueId().equals(to.getUuid())) {
FancyEconomy.getInstance().getTranslator()
.translate("cannot-pay-yourself")
.send(player);
return;
}
}

CurrencyPlayer from = CurrencyPlayerManager.getPlayer(player.getUniqueId());
CurrencyPlayer to = CurrencyPlayerManager.getPlayer(uuid);
CurrencyPlayer from = CurrencyPlayerManager.getPlayer(player.getUniqueId(), player.getName());
from.setUsername(player.getName());

if (targetPlayer != null) {
to.setUsername(targetPlayer.getName());
}

boolean allowNegativeBalance = FancyEconomy.getInstance().getFancyEconomyConfig().allowNegativeBalance();
if (!allowNegativeBalance && from.getBalance(currency) < amount) {
FancyEconomy.getInstance().getTranslator()
Expand Down
53 changes: 29 additions & 24 deletions plugins/fancyeconomy/src/main/java/com/fancyinnovations/fancyeconomy/commands/PayCMD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.fancyinnovations.fancyeconomy.currencies.CurrencyPlayerManager;
import com.fancyinnovations.fancyeconomy.currencies.CurrencyRegistry;
import de.oliver.fancylib.MessageHelper;
import de.oliver.fancylib.UUIDFetcher;
import dev.jorel.commandapi.annotations.Command;
import dev.jorel.commandapi.annotations.Default;
import dev.jorel.commandapi.annotations.Permission;
Expand All @@ -16,8 +15,6 @@
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.UUID;

@Command("pay")
@Permission("fancyeconomy.pay")
public class PayCMD {
Expand All @@ -39,31 +36,39 @@ public static void pay(
targetName = targetPlayer.getName();
}

UUID uuid = targetPlayer != null ? targetPlayer.getUniqueId() : UUIDFetcher.getUUID(targetName);

if (uuid == null) {
FancyEconomy.getInstance().getTranslator()
.translate("player-not-found")
.replace("player", targetName)
.send(player);
return;
}

if (player.getUniqueId().equals(uuid)) {
FancyEconomy.getInstance().getTranslator()
.translate("cannot-pay-yourself")
.send(player);
return;
CurrencyPlayer to;
if (targetPlayer != null) {
if (player.getUniqueId().equals(targetPlayer.getUniqueId())) {
FancyEconomy.getInstance().getTranslator()
.translate("cannot-pay-yourself")
.send(player);
return;
}

to = CurrencyPlayerManager.getPlayer(targetPlayer.getUniqueId(), targetPlayer.getName());
to.setUsername(targetPlayer.getName());
} else {
to = CurrencyPlayerManager.getCachedPlayer(targetName);
if (to == null) {
FancyEconomy.getInstance().getTranslator()
.translate("player-not-found")
.replace("player", targetName)
.send(player);
return;
}

if (player.getUniqueId().equals(to.getUuid())) {
FancyEconomy.getInstance().getTranslator()
.translate("cannot-pay-yourself")
.send(player);
return;
}
}

Currency currency = CurrencyRegistry.getDefaultCurrency();

CurrencyPlayer from = CurrencyPlayerManager.getPlayer(player.getUniqueId());
CurrencyPlayer to = CurrencyPlayerManager.getPlayer(uuid);

if (targetPlayer != null) {
to.setUsername(targetPlayer.getName());
}
CurrencyPlayer from = CurrencyPlayerManager.getPlayer(player.getUniqueId(), player.getName());
from.setUsername(player.getName());

boolean allowNegativeBalance = FancyEconomy.getInstance().getFancyEconomyConfig().allowNegativeBalance();
if (!allowNegativeBalance && from.getBalance(currency) < amount) {
Expand Down
25 changes: 23 additions & 2 deletions ...omy/src/main/java/com/fancyinnovations/fancyeconomy/currencies/CurrencyPlayerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,41 @@ public static CurrencyPlayer getPlayer(UUID uuid) {
}

String username = UUIDFetcher.getName(uuid);
return getPlayer(uuid, username != null ? username : "N/A");
}

public static CurrencyPlayer getPlayer(UUID uuid, String username) {
if (cachedPlayers.containsKey(uuid)) {
return cachedPlayers.get(uuid);
}

CurrencyPlayer player = new CurrencyPlayer(uuid, username != null ? username : "N/A");
cachedPlayers.put(uuid, player);
FancyEconomy.getInstance().getSaveWorkload().addValue(() -> player);
return player;
}

public static CurrencyPlayer getPlayer(String username) {
public static CurrencyPlayer getCachedPlayer(String username) {
if (username == null) {
return null;
}

for (CurrencyPlayer player : cachedPlayers.values()) {
if (player.getUsername().equalsIgnoreCase(username)) {
String playerName = player.getUsername();
if (playerName != null && playerName.equalsIgnoreCase(username)) {
return player;
}
}

return null;
}

public static CurrencyPlayer getPlayer(String username) {
CurrencyPlayer cachedPlayer = getCachedPlayer(username);
if (cachedPlayer != null) {
return cachedPlayer;
}

UUID uuid = UUIDFetcher.getUUID(username);
if (uuid == null) {
return null;
Expand Down
Loading