From 7e9fc36a81ed6b09dfab2c032af85516ab7890a0 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 11 Mar 2022 20:38:09 +0100
Subject: [PATCH] No NPC respawning, No Fightservers, Potential portal depth
 fix

---
 src/de/steamwar/lobby/display/NPC.java        |  8 ++++++
 .../lobby/portal/FightserverPortal.java       | 26 +++++++++++++------
 src/de/steamwar/lobby/portal/Portal.java      |  4 +--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/de/steamwar/lobby/display/NPC.java b/src/de/steamwar/lobby/display/NPC.java
index 426ca54..4a56d02 100644
--- a/src/de/steamwar/lobby/display/NPC.java
+++ b/src/de/steamwar/lobby/display/NPC.java
@@ -104,6 +104,14 @@ public class NPC {
         display = new Displayable(location, this::show, this::hide);
     }
 
+    public Location getLocation() {
+        return location;
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
     private void show(Player player) {
         TinyProtocol.instance.sendPacket(player, addPlayerInfo);
         TinyProtocol.instance.sendPacket(player, namedSpawn);
diff --git a/src/de/steamwar/lobby/portal/FightserverPortal.java b/src/de/steamwar/lobby/portal/FightserverPortal.java
index 24ec55d..8b0873a 100644
--- a/src/de/steamwar/lobby/portal/FightserverPortal.java
+++ b/src/de/steamwar/lobby/portal/FightserverPortal.java
@@ -31,6 +31,7 @@ import org.bukkit.util.Vector;
 
 import java.util.*;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 public class FightserverPortal implements PortalHandler, Comparable<FightserverPortal> {
 
@@ -121,15 +122,25 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
     }
 
     private void updateNPCs(List<Location> locations, List<NPC> npcs, List<Integer> players) {
-        npcs.forEach(NPC::delete);
-        npcs.clear();
+        List<SteamwarUser> remainingPlayers = players.stream().map(SteamwarUser::get).collect(Collectors.toList());
+        List<Location> remainingLocations = new ArrayList<>(locations);
+        npcs.removeIf(npc -> {
+            SteamwarUser user = SteamwarUser.get(npc.getUuid());
+            if(remainingPlayers.contains(user)) {
+                remainingPlayers.remove(user);
+                remainingLocations.remove(npc.getLocation());
+                return false;
+            } else {
+                npc.delete();
+                return true;
+            }
+        });
 
-        for(int i = 0; i < players.size(); i++) {
-            if(i >= locations.size())
+        for(SteamwarUser user : remainingPlayers) {
+            if(remainingLocations.isEmpty())
                 break;
 
-            SteamwarUser user = SteamwarUser.get(players.get(i));
-            npcs.add(new NPC(locations.get(i), user.getUUID(), user.getUserName()));
+            npcs.add(new NPC(remainingLocations.remove(0), user.getUUID(), user.getUserName()));
         }
     }
 
@@ -206,14 +217,13 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
             case "waiting":
             case "PRE_LEADER_SETUP":
                 return "Warten auf Spieler";
-            case "fighting":
-                return "Kampf läuft seit";
             case "PRE_SCHEM_SETUP":
                 return "Schemauswahl";
             case "POST_SCHEM_SETUP":
                 return "Vorbereitung";
             case "PRE_RUNNING":
                 return "Kampfbeginn in";
+            case "fighting":
             case "RUNNING":
                 return "Kampf läuft";
             case "end":
diff --git a/src/de/steamwar/lobby/portal/Portal.java b/src/de/steamwar/lobby/portal/Portal.java
index fe7a871..d0ac3c8 100644
--- a/src/de/steamwar/lobby/portal/Portal.java
+++ b/src/de/steamwar/lobby/portal/Portal.java
@@ -74,7 +74,7 @@ public class Portal implements PortalHandler, ConfigurationSerializable {
 
     private final Location pos1;
     private final Location pos2;
-    private double depth;
+    private final double depth;
 
     private final Vector pos1Vector;
     private final double yRotation;
@@ -120,7 +120,7 @@ public class Portal implements PortalHandler, ConfigurationSerializable {
 
         Vector orientation = pos2.toVector().subtract(pos1.toVector());
         this.yRotation = Math.atan2(orientation.getX(), orientation.getZ());
-        this.pos1Vector = pos1.toVector().subtract(new Vector(depth/2, 0, 0).rotateAroundY(-yRotation));
+        this.pos1Vector = pos1.toVector().subtract(new Vector(depth/2, 0, 0).rotateAroundY(yRotation));
         this.rotatedShape = new Vector(depth == 0.0 ? 1.0 : depth, orientation.getY(), orientation.clone().setY(0).length());
 
         this.handler = handlerConstructor.apply(this);