diff --git a/build.gradle b/build.gradle index 7f5a414..52ced7a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { group 'me.jamestmartin' version '0.1.0' -sourceCompatibility = 1.8 +sourceCompatibility = 14 repositories { mavenCentral() @@ -27,12 +27,12 @@ repositories { url = "https://maven.pkg.github.com/TownyAdvanced/Towny" credentials { username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("PASSWORD") + password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") } } } dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly 'com.palmergames.bukkit.towny:Towny:0.95.2.13' + compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' + compileOnly 'com.palmergames.bukkit.towny:Towny:0.96.2.17' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b16c34..4d9ca16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java b/src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java index 873331c..1ba778e 100644 --- a/src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java +++ b/src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java @@ -73,12 +73,13 @@ public class RankListener implements Listener, AutoCloseable { public void onEntityDeath(EntityDeathEvent event) { Player player = event.getEntity().getKiller(); if (player == null) return; - switch (event.getEntityType()) { case HUSK: - case PIG_ZOMBIE: + case ZOMBIFIED_PIGLIN: case ZOMBIE: case ZOMBIE_VILLAGER: + case ZOGLIN: + try { Wasteland.getInstance().getDatabase().incrementPlayerKills(player); Optional oldRank = EnlistedRank.getEnlistedRank(player); diff --git a/src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java b/src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java index 2bc84ef..3591085 100644 --- a/src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java +++ b/src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java @@ -5,9 +5,9 @@ import java.util.Optional; import org.bukkit.ChatColor; import org.bukkit.entity.Player; +import com.palmergames.bukkit.towny.TownyAPI; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.object.Resident; -import com.palmergames.bukkit.towny.object.TownyUniverse; public class TownyDependency implements TownyPrefix { private final String townTagColor; @@ -27,7 +27,7 @@ public class TownyDependency implements TownyPrefix { @Override public Optional getPrefix(Player player) { try { - Resident resident = TownyUniverse.getDataSource().getResident(player.getName()); + Resident resident = TownyAPI.getInstance().getDataSource().getResident(player.getName()); String tag = resident.getTown().getTag(); if (tag != null && !tag.equals("")) { return Optional.of(ChatColor.RESET + "[" + townTagColor + tag + ChatColor.RESET + "]");