diff --git a/pom.xml b/pom.xml index 4b77b3478..65377664f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 1.8 1.13 UTF-8 - 0.99.3.0 + 0.100.1.0 @@ -45,7 +45,7 @@ com.palmergames.bukkit.towny towny - 0.99.3.0 + 0.100.1.0 provided diff --git a/src/main/java/com/gmail/goosius/siegewar/SiegeWar.java b/src/main/java/com/gmail/goosius/siegewar/SiegeWar.java index f2e60c1be..bb1541e33 100644 --- a/src/main/java/com/gmail/goosius/siegewar/SiegeWar.java +++ b/src/main/java/com/gmail/goosius/siegewar/SiegeWar.java @@ -42,7 +42,7 @@ public class SiegeWar extends JavaPlugin { private static SiegeWar plugin; - private final String requiredTownyVersion = "0.99.3.0"; + private final String requiredTownyVersion = "0.100.1.0"; private static final SiegeHUDManager siegeHUDManager = new SiegeHUDManager(); private final Object scheduler; diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarDistanceUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarDistanceUtil.java index 6418662ae..eaa582109 100644 --- a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarDistanceUtil.java +++ b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarDistanceUtil.java @@ -275,7 +275,7 @@ public static void throwIfTownIsTooFarFromNationCapitalByDistance(Nation nation, * @throws TownyException thrown if the town or nation capital has no Homeblock set. */ private static boolean isTownTooFarFromNationCapitalByDistance(Nation nation, Town town) throws TownyException { - return TownySettings.getNationRequiresProximity() > 0 && MathUtil.distance(nation.getCapital().getHomeBlock().getCoord(), town.getHomeBlock().getCoord()) > TownySettings.getNationRequiresProximity(); + return TownySettings.getNationProximityToCapital() > 0 && MathUtil.distance(nation.getCapital().getHomeBlock().getCoord(), town.getHomeBlock().getCoord()) > TownySettings.getNationProximityToCapital(); } /** @@ -299,7 +299,7 @@ public static void throwIfTownIsTooFarFromNationCapitalByWorld(Nation nation, To * @throws TownyException thrown if the town or nation capital has no Homeblock set. */ private static boolean isTownTooFarFromNationCapitalByWorld(Nation nation, Town town) throws TownyException { - return TownySettings.getNationRequiresProximity() > 0 && !nation.getCapital().getHomeBlock().getWorld().getName().equals(town.getHomeBlock().getWorld().getName()); + return TownySettings.getNationProximityToCapital() > 0 && !nation.getCapital().getHomeBlock().getWorld().getName().equals(town.getHomeBlock().getWorld().getName()); } public static boolean isInANonBesiegedTown(Location location) { diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarMoneyUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarMoneyUtil.java index 9d0804ba3..af93d90b8 100644 --- a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarMoneyUtil.java +++ b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarMoneyUtil.java @@ -111,7 +111,7 @@ public static double getMoneyMultiplier(Town town) { if(extraMoneyPercentage == 0) { return 1; } else { - return 1 + ((extraMoneyPercentage / 100) * (town.getLevelID() -1)); + return 1 + ((extraMoneyPercentage / 100) * (town.getLevelNumber() -1)); } }