Skip to content

Commit

Permalink
Do the same for TownUtil, removing call to sendPrefixedNationMessage.
Browse files Browse the repository at this point in the history
  • Loading branch information
LlmDl committed Apr 26, 2024
1 parent 509ffff commit df89aaa
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import java.util.List;
import java.util.stream.Collectors;

import org.bukkit.entity.Player;

import com.palmergames.bukkit.towny.TownyAPI;
import com.palmergames.bukkit.towny.TownyEconomyHandler;
import com.palmergames.bukkit.towny.TownyMessaging;
import com.palmergames.bukkit.towny.TownySettings;
Expand Down Expand Up @@ -52,13 +55,14 @@ public static void checkNationResidentsRequirementsOfTown(Town town) {
if (findNewCapital(town, nation))
return;

List<Player> onlinePlayers = TownyAPI.getInstance().getOnlinePlayersInNation(nation);
// No new capital found, delete the nation and potentially refund the capital town.
TownyUniverse.getInstance().getDataSource().removeNation(nation);
if (nation.exists()) // The PreDeleteNationEvent was cancelled.
return;

TownyMessaging.sendPrefixedNationMessage(nation, Translatable.of("msg_nation_disbanded_town_not_enough_residents", town.getName()));
TownyMessaging.sendGlobalMessage(Translatable.of("msg_del_nation", nation));
onlinePlayers.forEach(p -> TownyMessaging.sendMsg(p, Translatable.of("msg_nation_disbanded_town_not_enough_residents", town.getName())));
TownyMessaging.sendGlobalMessage(Translatable.of("msg_del_nation", nation.getName()));

if (TownyEconomyHandler.isActive() && TownySettings.isRefundNationDisbandLowResidents()) {
town.getAccount().deposit(TownySettings.getNewNationPrice(), "nation refund");
Expand Down

0 comments on commit df89aaa

Please sign in to comment.