queue enable check centralized

This commit is contained in:
SuperRonanCraft 2023-04-14 21:39:43 -04:00
parent 4483f35d0f
commit bc184d366e
4 changed files with 10 additions and 5 deletions

View File

@ -213,7 +213,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
info.add("&7- &6Biomes&7: &f" + _rtpworld.getBiomes().toString());
info.add("&7- &eShape&7: &f" + _rtpworld.getShape().toString() + getInfo(_rtpworld, worldDefault, "shape"));
info.add("&7- &6Permission Group&7: " + (_rtpworld.getConfig() != null ? "&a" + _rtpworld.getConfig().getGroupName() : "&cN/A"));
info.add("&7- &eQueue Available&7: " + QueueHandler.getApplicableAsync(_rtpworld).size());
info.add("&7- &eQueue Available&7: " + (QueueHandler.isEnabled() ? QueueHandler.getApplicableAsync(_rtpworld).size() : "&cDisabled"));
}
return info;
}

View File

@ -3,6 +3,7 @@ package me.SuperRonanCraft.BetterRTP.references.database;
import lombok.Getter;
import lombok.NonNull;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueHandler;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.RandomLocation;
import org.bukkit.Bukkit;
@ -57,7 +58,7 @@ public abstract class SQLite {
}
public void load() {
if (!BetterRTP.getInstance().getSettings().isQueueEnabled()) return;
if (!QueueHandler.isEnabled()) return;
loaded = false;
tables = getTables();
Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> {

View File

@ -42,7 +42,7 @@ public class QueueGenerator {
}
void generate(@Nullable RTPWorld rtpWorld) {
if (!BetterRTP.getInstance().getSettings().isQueueEnabled()) return;
if (!QueueHandler.isEnabled()) return;
Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), () -> {
if (!DatabaseHandler.getQueue().isLoaded()) {
generate(rtpWorld);

View File

@ -21,6 +21,10 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
boolean loaded = false;
private final QueueGenerator generator = new QueueGenerator();
public static boolean isEnabled() {
return BetterRTP.getInstance().getSettings().isQueueEnabled();
}
public void registerEvents(BetterRTP pl) {
PluginManager pm = pl.getServer().getPluginManager();
pm.registerEvents(this, pl);
@ -56,7 +60,7 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
public static List<QueueData> getApplicableAsync(RTPWorld rtpWorld) {
List<QueueData> available = new ArrayList<>();
//Is Enabled??
if (!BetterRTP.getInstance().getSettings().isQueueEnabled()) return available;
if (!isEnabled()) return available;
List<QueueData> queueData = DatabaseHandler.getQueue().getInRange(new DatabaseQueue.QueueRangeData(rtpWorld));
for (QueueData data : queueData) {
if (!Objects.equals(data.getLocation().getWorld().getName(), rtpWorld.getWorld().getName()))
@ -79,7 +83,7 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
}
public static void remove(Location loc) {
if (!BetterRTP.getInstance().getSettings().isQueueEnabled()) return;
if (!isEnabled()) return;
Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> {
//Delete all queue data async
if (DatabaseHandler.getQueue().removeLocation(loc)) {