diff --git a/build.gradle.kts b/build.gradle.kts index adb47fb..e308982 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,7 @@ repositories { maven("https://jitpack.io") maven("https://maven.enginehub.org/repo/") mavenCentral() + mavenLocal() } dependencies { @@ -23,7 +24,7 @@ dependencies { implementation("org.jetbrains:annotations:24.1.0") implementation("com.j256.ormlite:ormlite-core:6.1") implementation("com.j256.ormlite:ormlite-jdbc:6.1") - implementation("com.iridium:IridiumTeams:2.3.5") + implementation("com.iridium:IridiumTeams:2.3.8") // Other dependencies that are not required or already available at runtime compileOnly("org.projectlombok:lombok:1.18.30") diff --git a/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java b/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java index 9155bbe..1db79e9 100644 --- a/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java +++ b/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java @@ -18,6 +18,7 @@ public class Configuration extends com.iridium.iridiumteams.configs.Configuratio public Configuration() { super("&c", "Faction", "IridiumFactions"); this.createRequiresName = true; + this.preventTntGriefing = false; this.levelRewards = ImmutableMap.builder() .put(1, new Reward(new Item(XMaterial.EXPERIENCE_BOTTLE, 1, "&c&lLevel %faction_level% Reward", Arrays.asList( diff --git a/src/main/java/com/iridium/iridiumfactions/managers/FactionManager.java b/src/main/java/com/iridium/iridiumfactions/managers/FactionManager.java index 0d7a6ab..fc49ef6 100644 --- a/src/main/java/com/iridium/iridiumfactions/managers/FactionManager.java +++ b/src/main/java/com/iridium/iridiumfactions/managers/FactionManager.java @@ -270,9 +270,12 @@ public synchronized TeamBlock getTeamBlock(Faction faction, XMaterial xMaterial) } @Override - public synchronized TeamSetting getTeamSetting(Faction faction, String settingKey) { + public synchronized @Nullable TeamSetting getTeamSetting(Faction faction, String settingKey) { Setting settingConfig = IridiumFactions.getInstance().getSettingsList().get(settingKey); - String defaultValue = settingConfig == null ? "" : settingConfig.getDefaultValue(); + if (settingConfig == null) { + return null; + } + String defaultValue = settingConfig.getDefaultValue(); Optional teamSetting = IridiumFactions.getInstance().getDatabaseManager().getTeamSettingsTableManager().getEntry(new TeamSetting(faction, settingKey, defaultValue)); if (teamSetting.isPresent()) { return teamSetting.get();