From 25c4658de4c50d9ea83d9f324b2e7cbab36176fe Mon Sep 17 00:00:00 2001
From: "Lukas Rieger (Blue)" <TBlueF@users.noreply.github.com>
Date: Mon, 27 Jun 2022 01:07:31 +0200
Subject: [PATCH] Moving live-player-endpoint

---
 src/markers/PlayerMarker.js        |  7 ++-----
 src/markers/PlayerMarkerManager.js | 17 +++++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/markers/PlayerMarker.js b/src/markers/PlayerMarker.js
index c682b89..a0f4726 100644
--- a/src/markers/PlayerMarker.js
+++ b/src/markers/PlayerMarker.js
@@ -40,8 +40,6 @@ export class PlayerMarker extends Marker {
         this.data.playerUuid = playerUuid;
         this.data.name = playerUuid;
 
-        this.data.world = "?";
-
         this.elementObject = new CSS2DObject(htmlToElement(`
 <div id="bm-marker-${this.data.id}" class="bm-marker-${this.data.type}">
     <img src="assets/playerheads/${this.data.playerUuid}.png" alt="playerhead" draggable="false">
@@ -89,7 +87,7 @@ export class PlayerMarker extends Marker {
      * @typedef PlayerLike {{
      *      uuid: string,
      *      name: string,
-     *      world: string,
+     *      foreign: boolean,
      *      position: {x: number, y: number, z: number},
      *      rotation: {yaw: number, pitch: number, roll: number}
      * }}
@@ -138,8 +136,7 @@ export class PlayerMarker extends Marker {
             this.playerNameElement.innerHTML = name;
 
         // update world
-        this.data.world = markerData.world || "?";
-
+        this.data.foreign = markerData.foreign;
     }
 
     dispose() {
diff --git a/src/markers/PlayerMarkerManager.js b/src/markers/PlayerMarkerManager.js
index 4b4cbb7..da2d1c5 100644
--- a/src/markers/PlayerMarkerManager.js
+++ b/src/markers/PlayerMarkerManager.js
@@ -33,15 +33,12 @@ export class PlayerMarkerManager extends MarkerManager {
      * @constructor
      * @param markerScene {THREE.Scene} - The scene to which all markers will be added
      * @param playerDataUrl {string} - The marker file from which this manager updates its markers
-     * @param worldId {string} - The worldId of the world for which the markers should be loaded
      * @param events {EventTarget}
      */
-    constructor(markerScene, playerDataUrl, worldId, events = null) {
+    constructor(markerScene, playerDataUrl, events = null) {
         super(markerScene, playerDataUrl, events);
         Object.defineProperty(this, 'isPlayerMarkerManager', {value: true});
 
-        this.worldId = worldId;
-
         this.getPlayerMarkerSet();
     }
 
@@ -105,8 +102,8 @@ export class PlayerMarkerManager extends MarkerManager {
         // update
         marker.updateFromData(markerData);
 
-        // hide if wrong world
-        marker.visible = markerData.world === this.worldId;
+        // hide if from different world
+        marker.visible = !markerData.foreign;
 
         return marker;
     }
@@ -127,4 +124,12 @@ export class PlayerMarkerManager extends MarkerManager {
         return playerMarkerSet;
     }
 
+    /**
+     * @param playerUuid {string}
+     * @returns {Marker}
+     */
+    getPlayerMarker(playerUuid) {
+        return this.markers.get("bm-player-" + playerUuid);
+    }
+
 }
\ No newline at end of file