diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java index 3b98792..1925409 100644 --- a/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java +++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java @@ -58,57 +58,53 @@ public void onEnable() { BlazeSMP.instance = this; isEndOpen = getConfig().getBoolean("isEndOpen", false); - this.log.info("Enabling BlazeSMP..."); - - - this.getServer().getScheduler().runTaskLater(this, () -> { + this.log.info("Enabling BlazeSMP..."); + this.log.info("Loading Homes..."); this.homes = new Homes(); this.homes.load(); this.log.info("Loaded Homes!"); - }, 20L); - this.getServer().getScheduler().runTaskLater(this, () -> { this.log.info("Loading Clans..."); this.clans = new Clans(); this.clans.loadAllClans(); this.log.info("Loaded Clans!"); - }, 40L); - this.log.info("Registering Commands..."); - new ClanCommand().register(); - new ReportCommand().register(); - new ClaimCommand().register(); - new HomeCommand().register(); - new DiscordCommand().register(); - new ReloadCommand().register(); - new VanishCommand().register(); - new EventCommand(this).register(); - new RestartCommand().register(); - this.log.info("Registered Commands!"); + this.log.info("Registering Commands..."); + new ClanCommand().register(); + new ReportCommand().register(); + new ClaimCommand().register(); + new HomeCommand().register(); + new DiscordCommand().register(); + new ReloadCommand().register(); + new VanishCommand().register(); + new EventCommand(this).register(); + new RestartCommand().register(); + this.log.info("Registered Commands!"); - this.log.info("Registering EventListeners..."); - PluginManager pm = getServer().getPluginManager(); - pm.registerEvents(new PlayerJoinListener(), this); - pm.registerEvents(new PlayerChatListener(), this); - pm.registerEvents(new PlayerCommandBlockerListener(), this); - pm.registerEvents(new PlayerClaimListener(), this); - pm.registerEvents(new ChunkInventoryListener(), this); - pm.registerEvents(new PressurePlateListener(), this); - pm.registerEvents(new PlayerVsPlayerListener(clans), this); - pm.registerEvents(new EndPortalListener(this), this); - pm.registerEvents(new PvPListener(), this); - pm.registerEvents(new PlayerQuitListener(), this); - //pm.registerEvents(new ProtectedBlockListener(), this); - this.log.info("Registered EventListeners!"); + this.log.info("Registering EventListeners..."); + PluginManager pm = getServer().getPluginManager(); + pm.registerEvents(new PlayerJoinListener(), this); + pm.registerEvents(new PlayerChatListener(), this); + pm.registerEvents(new PlayerCommandBlockerListener(), this); + pm.registerEvents(new PlayerClaimListener(), this); + pm.registerEvents(new ChunkInventoryListener(), this); + pm.registerEvents(new PressurePlateListener(), this); + pm.registerEvents(new PlayerVsPlayerListener(clans), this); + pm.registerEvents(new EndPortalListener(this), this); + pm.registerEvents(new PvPListener(), this); + pm.registerEvents(new PlayerQuitListener(), this); + //pm.registerEvents(new ProtectedBlockListener(), this); + this.log.info("Registered EventListeners!"); - this.log.info("Starting Timer tasks..."); - this.nameUpdateTask = new PlayerNameUpdate().runTaskTimer(this, 0L, 20L); - this.tabListUpdateTask = new TabListTimer().runTaskTimer(this, 0L, 20L); - this.log.info("Started Timer tasks!"); + this.log.info("Starting Timer tasks..."); + this.nameUpdateTask = new PlayerNameUpdate().runTaskTimer(this, 0L, 20L); + this.tabListUpdateTask = new TabListTimer().runTaskTimer(this, 0L, 20L); + this.log.info("Started Timer tasks!"); - this.log.info("Enabled BlazeSMP!"); + this.log.info("Enabled BlazeSMP!"); + }, 20L); } @Override diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClaimCommand.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClaimCommand.java index 1ea0ff1..6bd3b50 100644 --- a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClaimCommand.java +++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClaimCommand.java @@ -53,18 +53,15 @@ public class ClaimCommand extends SimpleCommand { int MAX_CLAIMS = 50; if (playerClaims.size() >= MAX_CLAIMS) { player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.max_claims_reached"))); - System.out.println("Claim denied: max claims reached"); } else { Chunk playerChunk = player.getLocation().getChunk(); if (clans.isChunkClaimed(playerChunk)) { player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_already_claimed"))); - System.out.println("Claim denied: chunk already claimed"); } else { // claim too close to spawn 8 chunks // claim too close to spawn 152 blocks in all directions if (Math.abs(player.getX()) < 152.0 && Math.abs(player.getZ()) < 152.0) { player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_too_close_to_spawn"))); - System.out.println("Claim denied: chunk too close to spawn"); return true; } playerClaims.add(playerChunk); @@ -73,7 +70,6 @@ public class ClaimCommand extends SimpleCommand { clans.setClanChunks(playerClan, existingClaims); playerClan.save(); clans.saveAllClans(); - System.out.println("Chunk claimed successfully"); } } return true; @@ -90,10 +86,8 @@ public class ClaimCommand extends SimpleCommand { clans.setClanChunks(playerClan, existingClaims); playerClan.save(); clans.saveAllClans(); - System.out.println("Chunk unclaimed successfully"); } else { player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_not_owned"))); - System.out.println("Unclaim denied: chunk not owned"); } return true; } diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/RestartCommand.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/RestartCommand.java index 3786f97..4fdeeb2 100644 --- a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/RestartCommand.java +++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/RestartCommand.java @@ -3,6 +3,7 @@ package me.freezy.plugins.papermc.blazesmp.command; import me.freezy.plugins.papermc.blazesmp.BlazeSMP; import me.freezy.plugins.papermc.blazesmp.command.util.SimpleCommand; import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4; +import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -31,9 +32,9 @@ public class RestartCommand extends SimpleCommand { } String reason = String.join(" ", args); - String kickMessage = MiniMessage.miniMessage().deserialize(reason).toString(); + Component kickMessage = MiniMessage.miniMessage().deserialize(reason); - Bukkit.getOnlinePlayers().forEach(player -> player.kickPlayer(kickMessage)); + Bukkit.getOnlinePlayers().forEach(player -> player.kick(kickMessage)); Bukkit.getScheduler().runTaskLater(BlazeSMP.getInstance(), Bukkit::shutdown, 60L); // 3 seconds later (60 ticks)