Merge branch 'dev' of https://github.com/XRFoundation/XREngine into dev

EtherealEngine · Dec 19, 2022 · 80f8dfc · 80f8dfc
2 parents 11af1e4 + b9d978c
commit 80f8dfc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/engine/src/ecs/PriorityQueue.ts b/packages/engine/src/ecs/PriorityQueue.ts
@@ -1,6 +1,7 @@
 import { DeepReadonly } from '@xrengine/common/src/DeepReadonly'
 
 import { Entity } from './classes/Entity'
+import { entityExists } from './functions/EntityFunctions'
 
 export const createPriorityQueue = (args: { accumulationBudget: number }) => {
   const accumulatingPriorities = new Map<
@@ -32,8 +33,9 @@ export const createPriorityQueue = (args: { accumulationBudget: number }) => {
       for (const [entity, item] of accumulatingPriorities) {
         item.normalizedPriority += (item.accumulatedPriority * queue.accumulationBudget) / totalAccumulation
         item.accumulatedPriority = 0
-        if (item.normalizedPriority >= 1) {
-          priorityEntites.add(entity)
+        const exists = entityExists(entity)
+        if (item.normalizedPriority >= 1 || !exists) {
+          if (exists) priorityEntites.add(entity)
           queue.removeEntity(entity)
         }
       }