Fix entity delete in worker

Author: FabianTerhorst

api/AltV.Net.NetworkingEntity/Client/proto.js

@@ -10,7 +10,7 @@ class Proto {
         this.ServerEvent = root.lookupType("Entity.ServerEvent");
         this.AuthEvent = root.lookupType("Entity.AuthEvent");
         this.EntityStreamInEvent = root.lookupType("Entity.EntityStreamInEvent");
-        this.EntityStreamOutEvent= root.lookupType("Entity.EntityStreamOutEvent");
+        this.EntityStreamOutEvent = root.lookupType("Entity.EntityStreamOutEvent");
     }
 }
 

api/AltV.Net.NetworkingEntity/Client/streaming-worker.mjs

@@ -13,6 +13,9 @@ onmessage = function (e) {
             }
         }
     }
+    //if (!this.entityAreas) {
+    //    this.entityAreas = new Map();
+    //}
     if (!this.streamedIn) {
         this.streamedIn = new Map();
     }
@@ -64,6 +67,14 @@ function addEntityToArea(entity) {
     for (let i = startingYIndex; i <= stoppingYIndex; i++) {
         for (let j = startingXIndex; j <= stoppingXIndex; j++) {
             this.areas[j][i].push(entity);
+            /*let entityAreasArr;
+            if (!this.entityAreas.has(entity.id)) {
+                entityAreasArr = [];
+                this.entityAreas.set(entity.id, entityAreasArr);
+            } else {
+                entityAreasArr = this.entityAreas.get(entity.id);
+            }
+            entityAreasArr.push([this.areas[j][i], this.areas[j][i].length - 1]);*/
         }
     }
 }
@@ -88,11 +99,26 @@ function calcStartStopIndex(entity) {
 }
 
 function removeEntityFromArea(entity) {
+    /*if (this.entityAreas.has(entity.id)) {
+        for (const [areaArr, index] of this.entityAreas.get(entity.id)) {
+            areaArr.splice(index, 1);
+            console.log("index to remove", index);
+            console.log("new arr", areaArr);
+            // Finds entities stored behind that and decrement the stored indexes by one
+            for (let i = index; i < areaArr.length; i++) {
+                if (this.entityAreas.has(areaArr[i].id)) {
+                    const [entityAreaArr, entityIndex] = this.entityAreas.get(areaArr[i].id);
+                    console.log("index to update", entityIndex);
+                    this.entityAreas.set(areaArr[i].id, [entityAreaArr, entityIndex - 1]);
+                }
+            }
+        }
+    }*/
     const [startingYIndex, startingXIndex, stoppingYIndex, stoppingXIndex] = calcStartStopIndex(entity);
     if (startingYIndex == null || startingXIndex == null || stoppingYIndex == null || stoppingXIndex == null) return;
     for (let i = startingYIndex; i <= stoppingYIndex; i++) {
         for (let j = startingXIndex; j <= stoppingXIndex; j++) {
-            this.areas[j][i].filter((arrEntity) => arrEntity.id !== entity.id)
+            this.areas[j][i] = this.areas[j][i].filter((arrEntity) => arrEntity.id !== entity.id);
         }
     }
 }