Dev (#274)

core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.nandi0813</groupId>
         <artifactId>practice-parent</artifactId>
-        <version>6.4.5-SNAPSHOT</version>
+        <version>6.4.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>practice-core</artifactId>

core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SumoArg.java

@@ -6,6 +6,7 @@
 import dev.nandi0813.practice.manager.fight.event.enums.EventType;
 import dev.nandi0813.practice.manager.fight.event.events.duel.sumo.SumoData;
 import dev.nandi0813.practice.manager.fight.event.util.EventUtil;
+import dev.nandi0813.practice.module.interfaces.KitData;
 import dev.nandi0813.practice.util.Common;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
@@ -36,13 +37,34 @@ public static void run(Player player, String label, String[] args) {
                 EventUtil.changeStatus(sumoData, player);
             else
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.EVENT.ARGUMENTS.SUMO.EVENT-ALREADY-ENABLED"));
+            return;
         } else if (args.length == 2 && args[1].equalsIgnoreCase("disable")) {
             if (sumoData.isEnabled())
                 EventUtil.changeStatus(sumoData, player);
             else
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.EVENT.ARGUMENTS.SUMO.EVENT-ALREADY-DISABLED"));
-        } else
+            return;
+        } else if (args.length == 2 && args[1].equalsIgnoreCase("help")) {
+            sendHelpMSG(player, label);
+
+            return;
+        }
+
+        // Checking if the arena is enabled, if it is, it will send a message to the player and return.
+        if (sumoData.isEnabled()) {
+            Common.sendMMMessage(player, LanguageManager.getString("COMMAND.EVENT.ARGUMENTS.SUMO.CANT-EDIT"));
+            return;
+        }
+
+        // Setting the kit for the event.
+        if (args.length == 2 && args[1].equalsIgnoreCase("setkit")) {
+            KitData kitData = sumoData.getKitData();
+            kitData.setKitData(player, true);
+
+            Common.sendMMMessage(player, LanguageManager.getString("COMMAND.EVENT.ARGUMENTS.SUMO.KIT-SET"));
+        } else {
             sendHelpMSG(player, label);
+        }
     }
 
     private static void sendHelpMSG(Player player, String label) {
@@ -58,6 +80,7 @@ public static List<String> tabComplete(Player player, String[] args) {
         if (args.length == 2) {
             arguments.add("enable");
             arguments.add("disable");
+            arguments.add("setkit");
 
             return StringUtil.copyPartialMatches(args[1], arguments, new ArrayList<>());
         }

core/src/main/java/dev/nandi0813/practice/command/practice/arguments/EloArg.java

@@ -115,7 +115,7 @@ public static void run(Player player, String label, String[] args) {
 
     public static void run(String label, String[] args) {
         if (args.length == 4 && args[1].equalsIgnoreCase("reset")) {
-            Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.ELO.TARGET-OFFLINE").replace("%target%", args[2]));
                 return;
@@ -145,7 +145,7 @@ public static void run(String label, String[] args) {
                         .replace("%defaultElo%", String.valueOf(defaultElo)));
             }
         } else if (args.length == 5 && args[1].equalsIgnoreCase("set")) {
-            Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.ELO.TARGET-OFFLINE").replace("%target%", args[2]));
                 return;

core/src/main/java/dev/nandi0813/practice/command/practice/arguments/InfoArg.java

@@ -28,7 +28,7 @@ public static void run(Player player, String label, String[] args) {
             return;
         }
 
-        Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[1]));
+        Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[1]));
         if (target == null) {
             Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.INFO.TARGET-NOT-FOUND").replace("%target%", args[1]));
             return;

core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RankedArg.java

@@ -24,7 +24,7 @@ public static void run(Player player, String label, String[] args) {
                 return;
             }
 
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.TARGET-NOT-FOUND").replace("%target%", args[2]));
                 return;
@@ -51,7 +51,7 @@ public static void run(Player player, String label, String[] args) {
                 return;
             }
 
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.TARGET-NOT-FOUND").replace("%target%", args[2]));
                 return;
@@ -81,7 +81,7 @@ public static void run(Player player, String label, String[] args) {
                 return;
             }
 
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.TARGET-NOT-FOUND").replace("%target%", args[2]));
                 return;
@@ -122,7 +122,7 @@ public static void run(Player player, String label, String[] args) {
                 return;
             }
 
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.TARGET-NOT-FOUND").replace("%target%", args[2]));
                 return;
@@ -146,7 +146,7 @@ public static void run(Player player, String label, String[] args) {
 
     public static void run(String label, String[] args) {
         if (args.length == 3 && args[1].equalsIgnoreCase("reset")) {
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.TARGET-NOT-FOUND").replace("%target%", args[2]));
                 return;
@@ -162,7 +162,7 @@ public static void run(String label, String[] args) {
             } else
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.NO-GROUP").replace("%target%", target.getPlayer().getName()));
         } else if (args.length == 4 && args[1].equalsIgnoreCase("add")) {
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RANKED.TARGET-NOT-FOUND").replace("%target%", args[2]));
                 return;

core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ResetArg.java

@@ -29,7 +29,7 @@ public static void run(Player player, String label, String[] args) {
             return;
         }
 
-        Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[1]));
+        Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[1]));
         if (target == null) {
             Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RESET.TARGET-OFFLINE").replace("%target%", args[1]));
             return;
@@ -60,7 +60,7 @@ public static void run(String label, String[] args) {
             return;
         }
 
-        Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[1]));
+        Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[1]));
         if (target == null) {
             Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.RESET.TARGET-OFFLINE").replace("%target%", args[1]));
             return;

core/src/main/java/dev/nandi0813/practice/command/practice/arguments/UnrankedArg.java

@@ -24,7 +24,7 @@ public static void run(Player player, String label, String[] args) {
                 return;
             }
 
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.UNRANKED.TARGET-OFFLINE").replace("%target%", args[2]));
                 return;
@@ -51,7 +51,7 @@ public static void run(Player player, String label, String[] args) {
                 return;
             }
 
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.UNRANKED.TARGET-OFFLINE"));
                 return;
@@ -85,7 +85,7 @@ public static void run(Player player, String label, String[] args) {
 
     public static void run(String label, String[] args) {
         if (args.length == 3 && args[1].equalsIgnoreCase("reset")) {
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.UNRANKED.TARGET-OFFLINE"));
                 return;
@@ -101,7 +101,7 @@ public static void run(String label, String[] args) {
             } else
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.UNRANKED.NO-GROUP").replace("%target%", target.getPlayer().getName()));
         } else if (args.length == 4 && args[1].equalsIgnoreCase("add")) {
-            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[2]));
+            final Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[2]));
             if (target == null) {
                 Common.sendConsoleMMMessage(LanguageManager.getString("COMMAND.PRACTICE.ARGUMENTS.UNRANKED.TARGET-OFFLINE"));
                 return;

core/src/main/java/dev/nandi0813/practice/command/statistics/StatisticsCommand.java

@@ -52,7 +52,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 return false;
             }
 
-            Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().getOfflinePlayers().get(args[0]));
+            Profile target = ProfileManager.getInstance().getProfile(ServerManager.getInstance().resolvePlayer(args[0]));
             if (target == null) {
                 Common.sendMMMessage(player, LanguageManager.getString("COMMAND.STATISTICS.TARGET-NOT-EXISTS").replace("%target%", args[0]));
                 return false;

core/src/main/java/dev/nandi0813/practice/listener/PlayerPreLogin.java

@@ -22,7 +22,7 @@ public void onPreLogin(AsyncPlayerPreLoginEvent event) {
         if (!ZonePractice.isFullyLoaded()) {
             String message = LanguageManager.getString("PLUGIN-LOADING-MESSAGE");
             if (message == null || message.isEmpty()) {
-                message = "<red>The server is still loading, please wait...";
+                message = "<red>The server is still loading. Please try again in a moment.";
             }
             event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Common.mmToNormal(message));
             return;

core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaManager.java

@@ -91,6 +91,13 @@ public List<Arena> getEnabledArenas() {
         return enabledArenas;
     }
 
+    public List<FFAArena> getEnabledFFAArenas() {
+        List<FFAArena> enabledArenas = new ArrayList<>();
+        for (FFAArena arena : this.getFFAArenas())
+            if (arena.isEnabled()) enabledArenas.add(arena);
+        return enabledArenas;
+    }
+
     public void loadArenas(final StartUpCallback boolCallback) {
         Bukkit.getScheduler().runTaskAsynchronously(ZonePractice.getInstance(), () ->
         {

core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/BasicArena.java

@@ -95,12 +95,16 @@ public boolean teleport(Player player) {
 
     public void loadChunks() {
         if (this.cuboid != null) {
-            Bukkit.getScheduler().runTask(ZonePractice.getInstance(), () ->
-                    ClassImport.getClasses().getArenaUtil().loadArenaChunks(this));
-
-            if (ArenaManager.LOAD_CHUNKS) {
-                ArenaManager.LOADED_CHUNKS.addAll(this.cuboid.getChunks());
-            }
+            Bukkit.getScheduler().runTask(ZonePractice.getInstance(), () -> {
+                ClassImport.getClasses().getArenaUtil().loadArenaChunks(this);
+
+                if (ArenaManager.LOAD_CHUNKS) {
+                    // Collect only chunks that are already loaded — this avoids
+                    // synchronous chunk loading on the main thread which caused
+                    // server hangs of 10-15+ seconds.
+                    ArenaManager.LOADED_CHUNKS.addAll(this.cuboid.getChunks());
+                }
+            });
         }
     }
 

core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaUtil.java

@@ -109,6 +109,10 @@ public static boolean changeStatus(Player player, DisplayArena arena) {
                     Common.sendMMMessage(player, LanguageManager.getString("ARENA.STATUS-CHANGE.NO-FFA-POSITIONS"));
                     returnVal = false;
                 }
+                if (arena.getAssignedLadders().isEmpty()) {
+                    Common.sendMMMessage(player, "<red>Please assign at least one ladder to the arena!");
+                    return false;
+                }
             }
         } else {
             if (!MatchManager.getInstance().getLiveMatchesByArena(arena).isEmpty()) {

core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/Sumo.java

@@ -1,22 +1,32 @@
 package dev.nandi0813.practice.manager.fight.event.events.duel.sumo;
 
+import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.BracketsData;
 import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEvent;
 import dev.nandi0813.practice.module.util.ClassImport;
 import dev.nandi0813.practice.util.playerutil.PlayerUtil;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 public class Sumo extends DuelEvent {
 
     public Sumo(Object starter, SumoData sumoData) {
         super(starter, sumoData, "COMMAND.EVENT.ARGUMENTS.SUMO");
     }
 
+    @Override
+    public SumoData getEventData() {
+        return (SumoData) eventData;
+    }
+
     @Override
     public void teleport(Player player, Location location) {
         ClassImport.getClasses().getPlayerUtil().clearInventory(player);
         PlayerUtil.setFightPlayer(player);
+
         player.teleport(location);
+
+        this.getEventData().getKitData().loadKitData(player, true);
     }
 
 }

core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoData.java

@@ -2,26 +2,37 @@
 
 import dev.nandi0813.practice.manager.fight.event.enums.EventType;
 import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEventData;
+import dev.nandi0813.practice.module.interfaces.KitData;
+import dev.nandi0813.practice.module.util.ClassImport;
+import lombok.Getter;
 
 import java.io.IOException;
 
+@Getter
 public class SumoData extends DuelEventData {
 
+    protected final KitData kitData;
+
     public SumoData() {
         super(EventType.SUMO);
+        this.kitData = ClassImport.createKitData();
     }
 
     @Override
     protected void setCustomData() {
+        kitData.saveData(config, "kit");
     }
 
     @Override
     protected void getCustomData() {
+        kitData.getData(config, "kit");
     }
 
     @Override
     protected void enable() throws IOException {
-        if (spawns.size() != 2) {
+        if (!kitData.isSet()) {
+            throw new IOException("Kit data is not set.");
+        } else if (spawns.size() != 2) {
             throw new IOException("Spawn positions are not set. Or not equal to 2. Current size: " + spawns.size());
         }
     }

core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/Event.java

@@ -279,7 +279,7 @@ public boolean canDisplay() {
     @Override
     public GUIItem getSpectatorMenuItem() {
         return GUIFile.getGuiItem("GUIS.SPECTATOR-MENU.ICONS.EVENT-ICON")
-                .setMaterial(eventData.getIcon().getMaterial()).setDamage(eventData.getIcon().getDamage()).replace("%event_type%", type.getName())
+                .setBaseItem(eventData.getIcon().get()).replace("%event_type%", type.getName())
                 .replace("%event_duration%", this.getDurationRunnable().getFormattedTime())
                 .replace("%players%", String.valueOf(players.size())).replace("%spectators%", String.valueOf(spectators.size()));
 

core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueStartRunnable.java

@@ -32,8 +32,10 @@ public void run() {
                             .replace("%secondName%", (seconds == 1 ? LanguageManager.getString("SECOND-NAME.1SEC") : LanguageManager.getString("SECOND-NAME.1<SEC")))
                     , false);
 
-            SoundEffect sound = SoundManager.getInstance().getSound(SoundType.EVENT_QUEUE_COUNTDOWN);
-            if (sound != null) sound.play(event.getPlayers());
+            if (seconds <= 5) {
+                SoundEffect sound = SoundManager.getInstance().getSound(SoundType.EVENT_QUEUE_COUNTDOWN);
+                if (sound != null) sound.play(event.getPlayers());
+            }
         }
 
         if (seconds == 0) {

core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFA.java

@@ -27,6 +27,8 @@
 import dev.nandi0813.practice.util.playerutil.PlayerUtil;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.EnderPearl;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 import java.util.*;
@@ -144,6 +146,14 @@ public void removePlayer(Player player) {
 
         this.sendMessage(LanguageManager.getString("FFA.GAME.PLAYER-LEAVE").replace("%player%", player.getName()), true);
 
+        // Remove in-flight ender pearls to prevent the player from being
+        // teleported back to the arena world after they have left.
+        for (Entity entity : player.getWorld().getEntities()) {
+            if (entity instanceof EnderPearl pearl && player.equals(pearl.getShooter())) {
+                pearl.remove();
+            }
+        }
+
         players.remove(player);
         fightPlayers.remove(player);
         statistics.remove(player);