fix: respawn position with smartspawn or without quickspawn

Eredrim · May 9, 2024 · b81239a · b81239a
1 parent 38c5714
commit b81239a
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 10 deletions.
diff --git a/doc/configuration.md b/doc/configuration.md
@@ -33,7 +33,7 @@ general:
   regionclearexceptions: [] #List of regions where entities are not cleared after the match
   quickspawn: true #Spawn all players at the same time (tick). If false, spawn player one by one.
   showRemainingLives: true #Brodcast remaining lives in chat after each kill
-  smartspawn: true #Spread players on spawn points in a balanced way
+  smartspawn: true #Spread players on spawn points in a balanced way, i.e. as far apart from each other as possible
   timer:
     end: 0 #Time limit for the arena (in seconds), set to 0 to disable it
     winner: none #Winner team when time limit is reached

diff --git a/src/main/java/net/slipcor/pvparena/managers/SpawnManager.java b/src/main/java/net/slipcor/pvparena/managers/SpawnManager.java
@@ -54,20 +54,22 @@ public final class SpawnManager {
     private SpawnManager() {
     }
 
+    /**
+     * Method used to spawn a new player during a match or to respawn a player
+     * @param arena The arena which handle the game
+     * @param arenaPlayer The player to spawn
+     */
     public static void distributePlayer(Arena arena, ArenaPlayer arenaPlayer) {
         Set<ArenaRegion> arenaRegions = arena.getRegionsByType(RegionType.SPAWN);
 
         if (!arenaRegions.isEmpty()) {
             placeInsideSpawnRegions(arena, Collections.singleton(arenaPlayer), arenaRegions);
 
-        } else if (arena.getConfig().getBoolean(CFG.GENERAL_QUICK_SPAWN)) {
-            quickSpawn(arena, Collections.singleton(arenaPlayer), arenaPlayer.getArenaTeam());
-
         } else if (arena.getConfig().getBoolean(CFG.GENERAL_SMART_SPAWN)) {
-            distributeSmart(arena, Collections.singleton(arenaPlayer), arenaPlayer.getArenaTeam());
+            spawnPlayerSmartly(arena, arenaPlayer, arenaPlayer.getArenaTeam());
 
         } else {
-            distributeByOrder(arena, Collections.singleton(arenaPlayer), arenaPlayer.getArenaTeam());
+            quickSpawn(arena, Collections.singleton(arenaPlayer), arenaPlayer.getArenaTeam());
         }
     }
 
@@ -175,8 +177,7 @@ public void run() {
      * @param arenaPlayers players
      * @param arenaTeam    team
      */
-    public static void distributeSmart(Arena arena,
-                                       Set<ArenaPlayer> arenaPlayers, ArenaTeam arenaTeam) {
+    public static void distributeSmart(Arena arena, Set<ArenaPlayer> arenaPlayers, ArenaTeam arenaTeam) {
         debug(arena, "distributing smart-ish");
         if (CollectionUtils.isEmpty(arenaPlayers)) {
             return;
@@ -234,6 +235,61 @@ public void run() {
         new TeleportLater(arenaPlayers, iterations).runTaskLater(PVPArena.getInstance(), 1L);
     }
 
+    /**
+     * Spawn a player as far as possible from other players of its team.
+     * For FFA, from other players of the free team (i.e. everyone)
+     * @param arena The applicable arena
+     * @param arenaPlayer The player to (re)spawn
+     * @param arenaTeam The player team to use
+     */
+    public static void spawnPlayerSmartly(Arena arena, ArenaPlayer arenaPlayer, ArenaTeam arenaTeam) {
+        debug(arena, "(re)spawn smart-ish");
+
+        Set<PASpawn> availableSpawns = selectSpawnsForTeam(arena, arenaTeam, FIGHT);
+        List<PALocation> playersLocation = arenaTeam.getTeamMembers().stream()
+                .filter(ap -> !ap.equals(arenaPlayer))
+                .filter(ap -> ap.getStatus() == PlayerStatus.FIGHT)
+                .map(ArenaPlayer::getLocation)
+                .collect(Collectors.toList());
+
+
+        double xSum = 0;
+        double ySum = 0;
+        double zSum = 0;
+        int posNumber = playersLocation.size();
+
+        for(PALocation loc : playersLocation) {
+            xSum += loc.getX();
+            ySum += loc.getY();
+            zSum += loc.getZ();
+        }
+
+        PALocation otherPlayersCentroid = new PALocation(new Location(arena.getWorld(), xSum / posNumber, ySum / posNumber, zSum / posNumber));
+
+        PASpawn fartherSpawn = availableSpawns.stream()
+                .max(Comparator.comparingDouble(paSpawn -> paSpawn.getPALocation().getDistanceSquared(otherPlayersCentroid)))
+                .get();
+
+        class TeleportLater extends BukkitRunnable {
+            private final PASpawn spawn;
+            private final ArenaPlayer arenaPlayer;
+
+            TeleportLater(ArenaPlayer arenaPlayer, PASpawn spawn) {
+                this.arenaPlayer = arenaPlayer;
+                this.spawn = spawn;
+            }
+
+            @Override
+            public void run() {
+                this.arenaPlayer.setStatus(PlayerStatus.FIGHT);
+                TeleportManager.teleportPlayerToSpawn(arena, this.arenaPlayer, this.spawn);
+            }
+
+        }
+
+        new TeleportLater(arenaPlayer, fartherSpawn).runTaskLater(PVPArena.getInstance(), 1L);
+    }
+
     /**
      * Get spawn as far as possible of others spawns already taken
      *
@@ -259,8 +315,7 @@ private static PASpawn calculateFarSpawn(PASpawn[] takenSpawns,
             for (int index = 0; index < takenSpawns.length && takenSpawns[index] != null; index++) {
                 for (PASpawn totalSpawn : totalSpawns) {
                     for (PASpawn availableSpawn : availableSpawns) {
-                        if (totalSpawn.equals(takenSpawns[index])
-                                && availableSpawn.equals(spawn)) {
+                        if (totalSpawn.equals(takenSpawns[index]) && availableSpawn.equals(spawn)) {
                             tempDiff += totalSpawn.getPALocation().getDistanceSquared(availableSpawn.getPALocation());
                             trace(">> tempDiff: {}", tempDiff);
                         }