Merge pull request #657 from TownyAdvanced/hotfix/nationlevel_adaptation

Adapt to NationLevel change in Towny. Min Towny version 0.98.3.4.
TownyAdvanced · Aug 8, 2022 · f026611 · f026611
2 parents adec3fc + c925d74
commit f026611
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
 	<dependency>
       <groupId>com.palmergames.bukkit.towny</groupId>
       <artifactId>towny</artifactId>
-      <version>0.98.2.0</version>
+      <version>0.98.3.4</version>
       <scope>provided</scope>
 	</dependency>
     <dependency>

diff --git a/src/main/java/com/gmail/goosius/siegewar/SiegeWar.java b/src/main/java/com/gmail/goosius/siegewar/SiegeWar.java
@@ -45,7 +45,7 @@
 public class SiegeWar extends JavaPlugin {
 
 	private static SiegeWar plugin;
-	private final Version requiredTownyVersion = Version.fromString("0.98.2.0");
+	private final Version requiredTownyVersion = Version.fromString("0.98.3.4");
 	private static final SiegeHUDManager siegeHUDManager = new SiegeHUDManager();
 
 	private static boolean siegeWarPluginError = false;

diff --git a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarNationEventListener.java b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarNationEventListener.java
@@ -187,8 +187,7 @@ public void onPreNationEnemyRemove(NationPreRemoveEnemyEvent event) {
 	@EventHandler
 	public void on(NationBonusCalculationEvent event) {
 		Nation effectiveNation = SiegeWarNationUtil.getEffectiveNation(event.getNation());
-		int bonusBlocks = (Integer) TownySettings.getNationLevel(effectiveNation).get(TownySettings.NationLevel.TOWN_BLOCK_LIMIT_BONUS);
-		event.setBonusBlocks(bonusBlocks);
+		event.setBonusBlocks(TownySettings.getNationLevel(effectiveNation).townBlockLimitBonus());
 	}
 
 	/**