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

world load changes + biome command improvement

Browse Source
This commit is contained in:
RonanCraft 2023-05-12 10:03:07 -04:00
parent 69bfc79790
commit 72c2248934
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId> <groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId> <artifactId>BetterRTP</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.6.8-3-DEVBUILD</version> <version>3.6.8-3</version>
<!-- Upload patches to https://repo.ronanplugins.com/#/ --> <!-- Upload patches to https://repo.ronanplugins.com/#/ -->
@ -358,6 +358,7 @@
<groupId>com.ronanplugins</groupId> <groupId>com.ronanplugins</groupId>
<artifactId>Residence</artifactId> <artifactId>Residence</artifactId>
<version>4.9.1.9</version> <version>4.9.1.9</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

7
src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
View File

@ -1,11 +1,8 @@
package me.SuperRonanCraft.BetterRTP.player.commands.types; package me.SuperRonanCraft.BetterRTP.player.commands.types;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode; import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP;
import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Info; import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Info;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesHelp; import me.SuperRonanCraft.BetterRTP.references.messages.MessagesHelp;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesUsage; import me.SuperRonanCraft.BetterRTP.references.messages.MessagesUsage;
@ -31,7 +28,7 @@ public class CmdBiome implements RTPCommand, RTPCommandHelpable {
public List<String> tabComplete(CommandSender sendi, String[] args) { public List<String> tabComplete(CommandSender sendi, String[] args) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
if (args.length == 2) if (args.length >= 2)
HelperRTP_Info.addBiomes(list, args); HelperRTP_Info.addBiomes(list, args);
return list; return list;
} }

2
src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
View File

@ -63,7 +63,7 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable {
if (w.getName().startsWith(args[2]) && !BetterRTP.getInstance().getRTP().getDisabledWorlds().contains(w.getName())) if (w.getName().startsWith(args[2]) && !BetterRTP.getInstance().getRTP().getDisabledWorlds().contains(w.getName()))
list.add(w.getName()); list.add(w.getName());
} else if (args.length > 3) { } else if (args.length > 3) {
if (RTPCommandType.BIOME.getCmd().permission().check(sendi)) if (PermissionNode.BIOME.check(sendi))
HelperRTP_Info.addBiomes(list, args); HelperRTP_Info.addBiomes(list, args);
} }
return list; return list;

2
src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
View File

@ -50,7 +50,7 @@ public class CmdWorld implements RTPCommand, RTPCommandHelpable {
list.add(_wName); list.add(_wName);
} }
} else if (args.length >= 3) { } else if (args.length >= 3) {
if (RTPCommandType.BIOME.getCmd().permission().check(sendi)) if (PermissionNode.BIOME.check(sendi))
HelperRTP_Info.addBiomes(list, args); HelperRTP_Info.addBiomes(list, args);
} }
return list; return list;

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/events/EventListener.java
View File

@ -15,6 +15,7 @@ import org.bukkit.plugin.PluginManager;
public class EventListener implements Listener { public class EventListener implements Listener {
private final Interact interact = new Interact(); private final Interact interact = new Interact();
private final WorldLoad worldLoad = new WorldLoad();
public void registerEvents(BetterRTP pl) { public void registerEvents(BetterRTP pl) {
PluginManager pm = pl.getServer().getPluginManager(); PluginManager pm = pl.getServer().getPluginManager();
@ -62,6 +63,6 @@ public class EventListener implements Listener {
@EventHandler @EventHandler
private void worldLoad(WorldLoadEvent e) { private void worldLoad(WorldLoadEvent e) {
WorldLoad.worldLoad(); worldLoad.load(e);
} }
} }

15
src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java
View File

@ -2,17 +2,28 @@ package me.SuperRonanCraft.BetterRTP.player.events;
import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler; import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler;
import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper;
import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import me.SuperRonanCraft.BetterRTP.versions.FoliaHandler;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.scheduler.BukkitTask;
public class WorldLoad { public class WorldLoad {
static void worldLoad() { BukkitTask loader;
BetterRTP.getInstance().getLogger().info("NEW WORLD!");
void load(WorldLoadEvent e) {
//BetterRTP.getInstance().getLogger().info("NEW WORLD!");
if (loader != null)
loader.cancel();
loader = AsyncHandler.syncLater(() -> {
BetterRTP.debug("New world `" + e.getWorld().getName() + "` detected! Reloaded Databases!");
BetterRTP.getInstance().getDatabaseHandler().load(); BetterRTP.getInstance().getDatabaseHandler().load();
}, 20L * 5);
} }
} }