mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-07-03 08:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQL cooldown table generation (#177)

Browse Source
This commit is contained in:
TechnicallyCoded 2023-10-07 06:03:04 +02:00 committed by GitHub
parent c3602ee5e1
commit 9042fbf6d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java
View File

@ -25,12 +25,25 @@ public class DatabaseCooldowns extends SQLite {
@Override @Override
public List<String> getTables() { public List<String> getTables() {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
if (BetterRTP.getInstance().getCooldowns().isEnabled())
// Ignore loaded world names if cooldowns are disabled
if (!BetterRTP.getInstance().getCooldowns().isEnabled())
return list; return list;
for (World world : Bukkit.getWorlds()) {
if (!BetterRTP.getInstance().getRTP().getDisabledWorlds().contains(world.getName())) // Get list of disabled worlds and ensure list isn't null
List<String> disabledWorlds = BetterRTP.getInstance().getRTP().getDisabledWorlds();
if (disabledWorlds == null) disabledWorlds = new ArrayList<>();
// If there are disabled worlds, iterate through the loaded worlds on the server and
// add the world name to the list of table names if they aren't marked as disabled
List<World> worlds = Bukkit.getWorlds();
if (!disabledWorlds.isEmpty()) {
for (World world : worlds) {
if (!disabledWorlds.contains(world.getName()))
list.add(world.getName()); list.add(world.getName());
} }
}
return list; return list;
} }

5
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java
View File

@ -57,10 +57,13 @@ public abstract class SQLite {
public void load() { public void load() {
loaded = false; loaded = false;
tables = getTables(); tables = getTables();
if (tables.isEmpty()) { //Dont do anything is no colums to generate
// Don't do anything is no columns to generate
if (tables.isEmpty()) {
loaded = true; loaded = true;
return; return;
} }
AsyncHandler.async(() -> { AsyncHandler.async(() -> {
Connection connection = getSQLConnection(); Connection connection = getSQLConnection();
try { try {