Freezy-Studios/BlazeSMP
1
0
Fork 0
mirror of https://github.com/Freezy-Studios/BlazeSMP.git synced 2025-04-22 04:44:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated RestartCommand, Fixed claim and homes finally

Browse source
This commit is contained in:
DaTTV 2025-02-23 16:02:36 +01:00
parent e185f70437
commit 088ce798c6
3 changed files with 36 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java
View file

@ -58,57 +58,53 @@ public void onEnable() {
BlazeSMP.instance = this; BlazeSMP.instance = this;
isEndOpen = getConfig().getBoolean("isEndOpen", false); isEndOpen = getConfig().getBoolean("isEndOpen", false);
this.log.info("Enabling BlazeSMP...");
this.getServer().getScheduler().runTaskLater(this, () -> { this.getServer().getScheduler().runTaskLater(this, () -> {
this.log.info("Enabling BlazeSMP...");
this.log.info("Loading Homes..."); this.log.info("Loading Homes...");
this.homes = new Homes(); this.homes = new Homes();
this.homes.load(); this.homes.load();
this.log.info("Loaded Homes!"); this.log.info("Loaded Homes!");
}, 20L);
this.getServer().getScheduler().runTaskLater(this, () -> {
this.log.info("Loading Clans..."); this.log.info("Loading Clans...");
this.clans = new Clans(); this.clans = new Clans();
this.clans.loadAllClans(); this.clans.loadAllClans();
this.log.info("Loaded Clans!"); this.log.info("Loaded Clans!");
}, 40L);
this.log.info("Registering Commands..."); this.log.info("Registering Commands...");
new ClanCommand().register(); new ClanCommand().register();
new ReportCommand().register(); new ReportCommand().register();
new ClaimCommand().register(); new ClaimCommand().register();
new HomeCommand().register(); new HomeCommand().register();
new DiscordCommand().register(); new DiscordCommand().register();
new ReloadCommand().register(); new ReloadCommand().register();
new VanishCommand().register(); new VanishCommand().register();
new EventCommand(this).register(); new EventCommand(this).register();
new RestartCommand().register(); new RestartCommand().register();
this.log.info("Registered Commands!"); this.log.info("Registered Commands!");
this.log.info("Registering EventListeners..."); this.log.info("Registering EventListeners...");
PluginManager pm = getServer().getPluginManager(); PluginManager pm = getServer().getPluginManager();
pm.registerEvents(new PlayerJoinListener(), this); pm.registerEvents(new PlayerJoinListener(), this);
pm.registerEvents(new PlayerChatListener(), this); pm.registerEvents(new PlayerChatListener(), this);
pm.registerEvents(new PlayerCommandBlockerListener(), this); pm.registerEvents(new PlayerCommandBlockerListener(), this);
pm.registerEvents(new PlayerClaimListener(), this); pm.registerEvents(new PlayerClaimListener(), this);
pm.registerEvents(new ChunkInventoryListener(), this); pm.registerEvents(new ChunkInventoryListener(), this);
pm.registerEvents(new PressurePlateListener(), this); pm.registerEvents(new PressurePlateListener(), this);
pm.registerEvents(new PlayerVsPlayerListener(clans), this); pm.registerEvents(new PlayerVsPlayerListener(clans), this);
pm.registerEvents(new EndPortalListener(this), this); pm.registerEvents(new EndPortalListener(this), this);
pm.registerEvents(new PvPListener(), this); pm.registerEvents(new PvPListener(), this);
pm.registerEvents(new PlayerQuitListener(), this); pm.registerEvents(new PlayerQuitListener(), this);
//pm.registerEvents(new ProtectedBlockListener(), this); //pm.registerEvents(new ProtectedBlockListener(), this);
this.log.info("Registered EventListeners!"); this.log.info("Registered EventListeners!");
this.log.info("Starting Timer tasks..."); this.log.info("Starting Timer tasks...");
this.nameUpdateTask = new PlayerNameUpdate().runTaskTimer(this, 0L, 20L); this.nameUpdateTask = new PlayerNameUpdate().runTaskTimer(this, 0L, 20L);
this.tabListUpdateTask = new TabListTimer().runTaskTimer(this, 0L, 20L); this.tabListUpdateTask = new TabListTimer().runTaskTimer(this, 0L, 20L);
this.log.info("Started Timer tasks!"); this.log.info("Started Timer tasks!");
this.log.info("Enabled BlazeSMP!"); this.log.info("Enabled BlazeSMP!");
}, 20L);
} }
@Override @Override

6
src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClaimCommand.java
View file

@ -53,18 +53,15 @@ public class ClaimCommand extends SimpleCommand {
int MAX_CLAIMS = 50; int MAX_CLAIMS = 50;
if (playerClaims.size() >= MAX_CLAIMS) { if (playerClaims.size() >= MAX_CLAIMS) {
player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.max_claims_reached"))); player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.max_claims_reached")));
System.out.println("Claim denied: max claims reached");
} else { } else {
Chunk playerChunk = player.getLocation().getChunk(); Chunk playerChunk = player.getLocation().getChunk();
if (clans.isChunkClaimed(playerChunk)) { if (clans.isChunkClaimed(playerChunk)) {
player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_already_claimed"))); player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_already_claimed")));
System.out.println("Claim denied: chunk already claimed");
} else { } else {
// claim too close to spawn 8 chunks // claim too close to spawn 8 chunks
// claim too close to spawn 152 blocks in all directions // claim too close to spawn 152 blocks in all directions
if (Math.abs(player.getX()) < 152.0 && Math.abs(player.getZ()) < 152.0) { 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"))); 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; return true;
} }
playerClaims.add(playerChunk); playerClaims.add(playerChunk);
@ -73,7 +70,6 @@ public class ClaimCommand extends SimpleCommand {
clans.setClanChunks(playerClan, existingClaims); clans.setClanChunks(playerClan, existingClaims);
playerClan.save(); playerClan.save();
clans.saveAllClans(); clans.saveAllClans();
System.out.println("Chunk claimed successfully");
} }
} }
return true; return true;
@ -90,10 +86,8 @@ public class ClaimCommand extends SimpleCommand {
clans.setClanChunks(playerClan, existingClaims); clans.setClanChunks(playerClan, existingClaims);
playerClan.save(); playerClan.save();
clans.saveAllClans(); clans.saveAllClans();
System.out.println("Chunk unclaimed successfully");
} else { } else {
player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_not_owned"))); player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.chunk_not_owned")));
System.out.println("Unclaim denied: chunk not owned");
} }
return true; return true;
} }

5
src/main/java/me/freezy/plugins/papermc/blazesmp/command/RestartCommand.java
View file

@ -3,6 +3,7 @@ package me.freezy.plugins.papermc.blazesmp.command;
import me.freezy.plugins.papermc.blazesmp.BlazeSMP; import me.freezy.plugins.papermc.blazesmp.BlazeSMP;
import me.freezy.plugins.papermc.blazesmp.command.util.SimpleCommand; import me.freezy.plugins.papermc.blazesmp.command.util.SimpleCommand;
import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4; import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -31,9 +32,9 @@ public class RestartCommand extends SimpleCommand {
} }
String reason = String.join(" ", args); 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) Bukkit.getScheduler().runTaskLater(BlazeSMP.getInstance(), Bukkit::shutdown, 60L); // 3 seconds later (60 ticks)