Skip to content
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

Make status screen sending respect the async eco setting #7038

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Make status screen sending respect the async eco setting #7038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Towny/src/main/java/com/palmergames/bukkit/towny/command/NationCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2590,7 +2590,7 @@ private void nationStatusScreen(CommandSender sender, Nation nation) {
/*
* This is run async because it will ping the economy plugin for the nation bank value.
*/
plugin.getScheduler().runAsync(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(nation, sender)));
TownyEconomyHandler.economyExecutor().execute(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(nation, sender)));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Towny/src/main/java/com/palmergames/bukkit/towny/command/ResidentCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private void parseResidentCommandForConsole(final CommandSender sender, String[]
} else {
final Optional<Resident> resOpt = Optional.ofNullable(TownyUniverse.getInstance().getResident(split[0]));
if (resOpt.isPresent())
plugin.getScheduler().runAsync(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(resOpt.get(), sender)));
TownyEconomyHandler.economyExecutor().execute(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(resOpt.get(), sender)));
else
throw new TownyException(Translatable.of("msg_err_not_registered_1", split[0]));
}
Expand Down
2 changes: 1 addition & 1 deletion Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4283,7 +4283,7 @@ private void townStatusScreen(CommandSender sender, Town town) {
/*
* This is run async because it will ping the economy plugin for the town bank value.
*/
plugin.getScheduler().runAsync(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(town, sender)));
TownyEconomyHandler.economyExecutor().execute(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(town, sender)));
}

private void townResList(CommandSender sender, String[] args) throws TownyException {
Expand Down
6 changes: 3 additions & 3 deletions Towny/src/main/java/com/palmergames/bukkit/towny/command/TownyAdminCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ public void parseAdminResidentCommand(CommandSender sender, String[] split) thro
Resident resident = getResidentOrThrow(split[0]);

if (split.length == 1) {
plugin.getScheduler().runAsync(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(resident, sender)));
TownyEconomyHandler.economyExecutor().execute(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(resident, sender)));
return;
}

Expand Down Expand Up @@ -1167,7 +1167,7 @@ public void parseAdminTownCommand(CommandSender sender, String[] split) throws T
Town town = getTownOrThrow(split[0]);
if (split.length == 1) {
//This is run async because it will ping the economy plugin for the town bank value.
plugin.getScheduler().runAsync(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(town, sender)));
TownyEconomyHandler.economyExecutor().execute(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(town, sender)));
return;
}

Expand Down Expand Up @@ -1613,7 +1613,7 @@ public void parseAdminNationCommand(CommandSender sender, String[] split) throws
Nation nation = getNationOrThrow(split[0]);
if (split.length == 1) {
//This is run async because it will ping the economy plugin for the town bank value.
plugin.getScheduler().runAsync(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(nation, sender)));
TownyEconomyHandler.economyExecutor().execute(() -> TownyMessaging.sendStatusScreen(sender, TownyFormatter.getStatus(nation, sender)));
return;
}

Expand Down