Adds TownyUpkeepEvent #96

Open
wants to merge 2 commits into
from

Conversation

Projects
None yet
3 participants

Tom-Ski commented Jun 12, 2013

Also adds TownyTownUpkeepEvent and TownyNationUpkeepEvent

Minor changes to TownyFomatter to prevent the nation event firing double

@Zren Zren commented on the diff Jun 13, 2013

src/com/palmergames/bukkit/towny/TownyFormatter.java
@@ -287,7 +287,7 @@ public static String getTime() {
if (TownyEconomyHandler.isActive()) {
line = Colors.Green + "Bank: " + Colors.LightGreen + nation.getHoldingFormattedBalance();
- if (TownySettings.getNationUpkeepCost(nation) > 0)
+ if (nation.getCapital().hasUpkeep())
@Zren

Zren Jun 13, 2013

Contributor

Is this the same thing? Isn't there a nation.hasUpkeep()?

@Tom-Ski

Tom-Ski Jun 13, 2013

Not that I could see, I had to change it as getNationUpkeepCost would cause the event to fire twice.

Other than formatting issues, looks good 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment