From a335b5b52e5074c248e6ecab1c1ce01c87b0872b Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 9 Jul 2021 22:37:28 +0200 Subject: [PATCH] Fixed %player% bug --- build.gradle | 2 +- .../com/willfp/ecobosses/EcoBossesPlugin.java | 15 ++++++++------- .../java/com/willfp/ecobosses/bosses/EcoBoss.java | 4 ++-- .../bosses/util/obj/ImmunityOptions.java | 2 -- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 5362e7a..27dab03 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:5.2.0' + compileOnly 'com.willfp:eco:5.7.1' compileOnly 'org.jetbrains:annotations:19.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java index 7778c9e..e20f32a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java @@ -3,6 +3,7 @@ package com.willfp.ecobosses; import com.willfp.eco.core.AbstractPacketAdapter; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.command.AbstractCommand; +import com.willfp.eco.core.command.impl.PluginCommand; import com.willfp.eco.core.integrations.IntegrationLoader; import com.willfp.ecobosses.bosses.EcoBosses; import com.willfp.ecobosses.bosses.listeners.AttackListeners; @@ -35,7 +36,7 @@ public class EcoBossesPlugin extends EcoPlugin { * Internal constructor called by bukkit on plugin load. */ public EcoBossesPlugin() { - super("EcoBosses", 86576, 10635, "com.willfp.ecobosses.proxy", "&9"); + super(86576, 10635, "com.willfp.ecobosses.proxy", "&9"); instance = this; } @@ -98,13 +99,8 @@ public class EcoBossesPlugin extends EcoPlugin { return new ArrayList<>(); } - /** - * EcoEnchants-specific commands. - * - * @return A list of all commands. - */ @Override - public List getCommands() { + public List getPluginCommands() { return Arrays.asList( new CommandEbreload(this), new CommandEbdrop(this), @@ -145,4 +141,9 @@ public class EcoBossesPlugin extends EcoPlugin { TabCompleterEbspawn.class ); } + + @Override + protected String getMinimumEcoVersion() { + return "5.7.1"; + } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java index 0c1dd62..4b5c909 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java @@ -372,7 +372,7 @@ public class EcoBoss extends PluginDependent { this.topDamagerCommands = new HashMap<>(); for (int i = 1; i <= 3; i++) { this.topDamagerCommands.put(i, new ArrayList<>()); - for (String string : this.getConfig().getStrings("rewards.top-damager-commands." + i)) { + for (String string : this.getConfig().getStrings("rewards.top-damager-commands." + i, false)) { double chance = 100; if (string.contains("::")) { String[] split = string.split("::"); @@ -388,7 +388,7 @@ public class EcoBoss extends PluginDependent { // Nearby Rewards this.nearbyRadius = this.getConfig().getDouble("rewards.nearby-player-commands.radius"); this.nearbyPlayersCommands = new HashMap<>(); - for (String string : this.getConfig().getStrings("rewards.nearby-player-commands.commands")) { + for (String string : this.getConfig().getStrings("rewards.nearby-player-commands.commands", false)) { double chance = 100; if (string.contains("::")) { String[] split = string.split("::"); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/ImmunityOptions.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/ImmunityOptions.java index 3835c7b..30e54fb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/ImmunityOptions.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/ImmunityOptions.java @@ -1,7 +1,5 @@ package com.willfp.ecobosses.bosses.util.obj; -import lombok.Data; - public record ImmunityOptions(boolean immuneToFire, boolean immuneToSuffocation, boolean immuneToDrowning,