Upgrade to MC 1.16.4, upgrade towny, upgrade gradle.
parent
a3538566db
commit
11dbd1fc11
|
@ -6,7 +6,7 @@ plugins {
|
||||||
group 'me.jamestmartin'
|
group 'me.jamestmartin'
|
||||||
version '0.1.0'
|
version '0.1.0'
|
||||||
|
|
||||||
sourceCompatibility = 1.8
|
sourceCompatibility = 14
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
@ -27,12 +27,12 @@ repositories {
|
||||||
url = "https://maven.pkg.github.com/TownyAdvanced/Towny"
|
url = "https://maven.pkg.github.com/TownyAdvanced/Towny"
|
||||||
credentials {
|
credentials {
|
||||||
username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
|
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 {
|
dependencies {
|
||||||
compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT'
|
compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
|
||||||
compileOnly 'com.palmergames.bukkit.towny:Towny:0.95.2.13'
|
compileOnly 'com.palmergames.bukkit.towny:Towny:0.96.2.17'
|
||||||
}
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -73,12 +73,13 @@ public class RankListener implements Listener, AutoCloseable {
|
||||||
public void onEntityDeath(EntityDeathEvent event) {
|
public void onEntityDeath(EntityDeathEvent event) {
|
||||||
Player player = event.getEntity().getKiller();
|
Player player = event.getEntity().getKiller();
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
|
|
||||||
switch (event.getEntityType()) {
|
switch (event.getEntityType()) {
|
||||||
case HUSK:
|
case HUSK:
|
||||||
case PIG_ZOMBIE:
|
case ZOMBIFIED_PIGLIN:
|
||||||
case ZOMBIE:
|
case ZOMBIE:
|
||||||
case ZOMBIE_VILLAGER:
|
case ZOMBIE_VILLAGER:
|
||||||
|
case ZOGLIN:
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Wasteland.getInstance().getDatabase().incrementPlayerKills(player);
|
Wasteland.getInstance().getDatabase().incrementPlayerKills(player);
|
||||||
Optional<EnlistedRank> oldRank = EnlistedRank.getEnlistedRank(player);
|
Optional<EnlistedRank> oldRank = EnlistedRank.getEnlistedRank(player);
|
||||||
|
|
|
@ -5,9 +5,9 @@ import java.util.Optional;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import com.palmergames.bukkit.towny.TownyAPI;
|
||||||
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
|
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
|
||||||
import com.palmergames.bukkit.towny.object.Resident;
|
import com.palmergames.bukkit.towny.object.Resident;
|
||||||
import com.palmergames.bukkit.towny.object.TownyUniverse;
|
|
||||||
|
|
||||||
public class TownyDependency implements TownyPrefix {
|
public class TownyDependency implements TownyPrefix {
|
||||||
private final String townTagColor;
|
private final String townTagColor;
|
||||||
|
@ -27,7 +27,7 @@ public class TownyDependency implements TownyPrefix {
|
||||||
@Override
|
@Override
|
||||||
public Optional<String> getPrefix(Player player) {
|
public Optional<String> getPrefix(Player player) {
|
||||||
try {
|
try {
|
||||||
Resident resident = TownyUniverse.getDataSource().getResident(player.getName());
|
Resident resident = TownyAPI.getInstance().getDataSource().getResident(player.getName());
|
||||||
String tag = resident.getTown().getTag();
|
String tag = resident.getTown().getTag();
|
||||||
if (tag != null && !tag.equals("")) {
|
if (tag != null && !tag.equals("")) {
|
||||||
return Optional.of(ChatColor.RESET + "[" + townTagColor + tag + ChatColor.RESET + "]");
|
return Optional.of(ChatColor.RESET + "[" + townTagColor + tag + ChatColor.RESET + "]");
|
||||||
|
|
Loading…
Reference in New Issue