From 6a07ef89884646b28dba0e319ca95a72cddee94c Mon Sep 17 00:00:00 2001 From: AverageGithub Date: Sat, 16 Mar 2024 19:04:55 +0100 Subject: [PATCH] Fixes --- .../artillexstudios/axminions/AxMinionsPlugin.kt | 2 +- .../artillexstudios/axminions/minions/Minion.kt | 4 ++-- common/src/main/resources/config.yml | 15 +++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt b/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt index 112984d..b355577 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt @@ -146,7 +146,7 @@ class AxMinionsPlugin : AxPlugin() { } } } - }, 0, Config.AUTO_SAVE_MINUTES() * 20 * 60) + }, 1, Config.AUTO_SAVE_MINUTES() * 20 * 60) } override fun disable() { diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt b/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt index 73993c1..17aba19 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt @@ -301,7 +301,7 @@ class Minion( } else if (it.equals("charge")) { if (Config.CHARGE_ENABLED()) { val charge = Placeholder.parsed("charge", TimeUtils.format(charge - System.currentTimeMillis())) - item = ItemBuilder(type.getConfig().getSection("gui.$it"), charge).storePersistentData( + item = ItemBuilder(AxMinionsAPI.INSTANCE.getConfig().getConfig().getSection("gui.items.$it"), charge).storePersistentData( Keys.GUI, PersistentDataType.STRING, it ).get() } else { @@ -744,4 +744,4 @@ class Minion( override fun getInventory(): Inventory { return Bukkit.createInventory(this, 9) } -} \ No newline at end of file +} diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 5c8c1b6..d6feea0 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -105,12 +105,6 @@ gui: item: type: "air" slot: 13 - - # These settings are minion-specific, you can edit them in each minion's file! - upgrade: - slot: 15 - statistics: - slot: 16 charge: type: "lava_bucket" name: "<#FB8E08>Charge" @@ -118,12 +112,17 @@ gui: - "" - " - Current charge: <#FFCC00>" - "" - - "<#FB8E08>(!) Click here to charge your minion for 10 minutes for $10,000!" + - "<#FB8E08>(!) Click here to charge your minion for 30 minutes!" slot: 9 + # These settings are minion-specific, you can edit them in each minion's file! + upgrade: + slot: 15 + statistics: + slot: 16 # Only change this, if you are asked to! This will make your performance worse, and will spam messages in your console! # Requires restart! debug: false # Do not change! -config-version: 7 \ No newline at end of file +config-version: 7