From 5678934b0ef1a25ba277a2714ff9ed94df41bfa7 Mon Sep 17 00:00:00 2001 From: SuperRonanCraft Date: Tue, 4 Jul 2023 11:41:19 -0400 Subject: [PATCH] cooldown sql table wont generate for disabled worlds --- .../me/SuperRonanCraft/BetterRTP/BetterRTP.java | 2 +- .../references/database/DatabaseCooldowns.java | 10 ++++++++-- .../BetterRTP/references/database/SQLite.java | 4 ++++ src/main/resources/ideas.yml | 13 +++++++++---- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java index cca01da..57e3c45 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java @@ -105,10 +105,10 @@ public class BetterRTP extends JavaPlugin { playerDataManager.clear(); files.loadAll(); settings.load(); + cooldowns.load(); databaseHandler.load(); rtpLogger.setup(this); invs.load(); - cooldowns.load(); RTP.load(); cmd.load(); listener.load(); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java index c5030c5..c4e4764 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java @@ -1,7 +1,9 @@ package me.SuperRonanCraft.BetterRTP.references.database; import me.SuperRonanCraft.BetterRTP.BetterRTP; +import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData; +import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownHandler; import org.bukkit.Bukkit; import org.bukkit.World; @@ -23,8 +25,12 @@ public class DatabaseCooldowns extends SQLite { @Override public List getTables() { List list = new ArrayList<>(); - for (World world : Bukkit.getWorlds()) - list.add(world.getName()); + if (BetterRTP.getInstance().getCooldowns().isEnabled()) + return list; + for (World world : Bukkit.getWorlds()) { + if (!BetterRTP.getInstance().getRTP().getDisabledWorlds().contains(world.getName())) + list.add(world.getName()); + } return list; } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java index 788b26b..aab23b4 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java @@ -57,6 +57,10 @@ public abstract class SQLite { public void load() { loaded = false; tables = getTables(); + if (tables.isEmpty()) { //Dont do anything is no colums to generate + loaded = true; + return; + } AsyncHandler.async(() -> { Connection connection = getSQLConnection(); try { diff --git a/src/main/resources/ideas.yml b/src/main/resources/ideas.yml index f95c17c..4b327df 100644 --- a/src/main/resources/ideas.yml +++ b/src/main/resources/ideas.yml @@ -1,4 +1,9 @@ -#Add flags to `/rtp player ` command -ignore_cooldown: 'ignores current cooldown delay' -ignore_hunger: 'no hunger checks/charge' -ignore_economy: 'no price deducted from bank' \ No newline at end of file +New: + formatting: add time formatting for cooldowns/delays + + +Done: + #Add flags to `/rtp player ` command + ignore_cooldown: 'ignores current cooldown delay' + ignore_hunger: 'no hunger checks/charge' + ignore_economy: 'no price deducted from bank' \ No newline at end of file