Skip to content

Commit 6b4474c

Browse files
committed
- Add unformatted upkeep PAPI placeholders.
- Closes TownyAdvanced#7943. - New PAPI Placeholders: - %townyadvanced_daily_town_upkeep_unformatted% - An unformatted town upkeep amount. - %townyadvanced_daily_nation_upkeep_unformatted% - An unformatted nation upkeep amount.
1 parent 14410c9 commit 6b4474c

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

Towny/src/main/java/com/palmergames/bukkit/towny/hooks/TownyPlaceholderExpansion.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,11 @@ else if (!town.isEmpty())
517517
cost = TownySettings.getTownUpkeepCost(resident.getTownOrNull());
518518
}
519519
return getMoney(cost);
520+
case "daily_town_upkeep_unformatted": // %townyadvanced_daily_town_upkeep_unformatted%
521+
if (resident.hasTown()) {
522+
cost = TownySettings.getTownUpkeepCost(resident.getTownOrNull());
523+
}
524+
return String.valueOf(cost);
520525
case "daily_town_per_plot_upkeep": // %townyadvanced_daily_town_per_plot_upkeep%
521526
return getMoney(TownySettings.getTownUpkeep());
522527
case "daily_town_overclaimed_per_plot_upkeep_penalty": // %townyadvanced_daily_town_overclaimed_per_plot_upkeep_penalty%
@@ -536,6 +541,11 @@ else if (!town.isEmpty())
536541
cost = TownySettings.getNationUpkeepCost(resident.getNationOrNull());
537542
}
538543
return getMoney(cost);
544+
case "daily_nation_upkeep_unformatted": // %townyadvanced_daily_nation_upkeep_unformatted%
545+
if (resident.hasNation()) {
546+
cost = TownySettings.getNationUpkeepCost(resident.getNationOrNull());
547+
}
548+
return String.valueOf(cost);
539549
case "daily_nation_per_town_upkeep": // %townyadvanced_daily_nation_per_town_upkeep%
540550
return String.valueOf(TownySettings.getNationUpkeep());
541551
case "daily_nation_upkeep_reduction_from_nation_level": // %townyadvanced_daily_nation_upkeep_reduction_from_nation_level%

Towny/src/main/resources/ChangeLog.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10516,4 +10516,9 @@ v0.92.0.11:
1051610516
- Add ability to set max town and nation board lengths.
1051710517
- New Config Option: global_town_settings.max_board_length
1051810518
- Default: 170
10519-
- The maximum number of characters that the town (and nation,) board messages can be.
10519+
- The maximum number of characters that the town (and nation,) board messages can be.
10520+
- Add unformatted upkeep PAPI placeholders.
10521+
- Closes #7943.
10522+
- New PAPI Placeholders:
10523+
- %townyadvanced_daily_town_upkeep_unformatted% - An unformatted town upkeep amount.
10524+
- %townyadvanced_daily_nation_upkeep_unformatted% - An unformatted nation upkeep amount.

0 commit comments

Comments
 (0)