Merge latest dev changes.

xray-forge · Aug 21, 2023 · dade51f · dade51f
1 parent 15c0a1e
commit dade51f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/src/engine/core/database/objects.ts b/src/engine/core/database/objects.ts
@@ -63,6 +63,6 @@ export function registerWoundedObject(object: ClientObject): void {
  * todo;
  */
 export function unRegisterWoundedObject(object: ClientObject): void {
-  setPortableStoreValue(object, HELPING_WOUNDED_OBJECT_KEY, null);
+  setPortableStoreValue(object.id(), HELPING_WOUNDED_OBJECT_KEY, null);
   registry.objectsWounded.delete(object.id());
 }
diff --git a/src/engine/core/schemes/corpse_detection/evaluators/EvaluatorCorpseDetect.ts b/src/engine/core/schemes/corpse_detection/evaluators/EvaluatorCorpseDetect.ts
@@ -62,7 +62,7 @@ export class EvaluatorCorpseDetect extends property_evaluator {
         freeSelectedLootedObjectSpot(this.state.selectedCorpseId);
       }
 
-      setPortableStoreValue(corpseObject, LOOTING_DEAD_OBJECT_KEY, this.object.id());
+      setPortableStoreValue(corpseId, LOOTING_DEAD_OBJECT_KEY, this.object.id());
 
       // Link looting state for current object and looted object.
       this.state.selectedCorpseId = corpseId;

diff --git a/src/engine/core/schemes/corpse_detection/utils/loot.ts b/src/engine/core/schemes/corpse_detection/utils/loot.ts
@@ -41,6 +41,6 @@ export function freeSelectedLootedObjectSpot(lootedObject: TNumberId): void {
   const lootedObjectState: Optional<IRegistryObjectState> = registry.objects.get(lootedObject);
 
   if (lootedObjectState !== null) {
-    setPortableStoreValue(lootedObjectState.object, LOOTING_DEAD_OBJECT_KEY, null);
+    setPortableStoreValue(lootedObject, LOOTING_DEAD_OBJECT_KEY, null);
   }
 }
diff --git a/src/engine/core/schemes/help_wounded/evaluators/EvaluatorWoundedExist.ts b/src/engine/core/schemes/help_wounded/evaluators/EvaluatorWoundedExist.ts
@@ -68,7 +68,7 @@ export class EvaluatorWoundedExist extends property_evaluator {
     }
 
     // Block others from healing current target.
-    setPortableStoreValue(nearestObject as ClientObject, HELPING_WOUNDED_OBJECT_KEY, this.object.id());
+    setPortableStoreValue(nearestObjectId, HELPING_WOUNDED_OBJECT_KEY, this.object.id());
 
     this.state.selectedWoundedId = nearestObjectId;
     this.state.selectedWoundedVertexId = nearestVertexId;

diff --git a/src/engine/core/schemes/help_wounded/utils/help_wounded.ts b/src/engine/core/schemes/help_wounded/utils/help_wounded.ts
@@ -34,8 +34,6 @@ export function finishObjectHelpWounded(object: ClientObject): void {
  */
 export function freeSelectedWoundedStalkerSpot(helpingId: Optional<TNumberId>): void {
   if (helpingId !== null) {
-    const state: IRegistryObjectState = registry.objects.get(helpingId);
-
-    setPortableStoreValue(state.object, HELPING_WOUNDED_OBJECT_KEY, null);
+    setPortableStoreValue(helpingId, HELPING_WOUNDED_OBJECT_KEY, null);
   }
 }
diff --git a/src/engine/core/schemes/wounded/actions/ActionWounded.ts b/src/engine/core/schemes/wounded/actions/ActionWounded.ts
@@ -80,7 +80,7 @@ export class ActionWounded extends action_base {
 
     // Handle healing up by objects after some timeout.
     if (this.state.autoheal && !woundManager.canUseMedkit) {
-      const woundedAt: TTimestamp = getPortableStoreValue(this.object, "begin_wounded")!;
+      const woundedAt: TTimestamp = getPortableStoreValue(this.object.id(), "begin_wounded")!;
 
       if (woundedAt === null) {
         setPortableStoreValue(this.object.id(), "begin_wounded", now);

diff --git a/src/engine/core/utils/object/object_loot.ts b/src/engine/core/utils/object/object_loot.ts
@@ -48,7 +48,7 @@ export function findNearestCorpseToLoot(
 
     // Is registered in client side.
     if (corpseObject) {
-      const isLootedBy: Optional<TNumberId> = getPortableStoreValue(corpseObject, LOOTING_DEAD_OBJECT_KEY);
+      const isLootedBy: Optional<TNumberId> = getPortableStoreValue(id, LOOTING_DEAD_OBJECT_KEY);
 
       if (
         // Is not looted by anyone or looted by current object.

diff --git a/src/engine/core/utils/object/object_wounds.ts b/src/engine/core/utils/object/object_wounds.ts
@@ -93,7 +93,8 @@ export function findNearestWoundedObjectToHelp(
   // Iterate all active wounded objects.
   for (const [, woundedObjectState] of registry.objectsWounded) {
     const woundedObject: Optional<ClientObject> = woundedObjectState.object;
-    const objectHealedBy: Optional<TNumberId> = getPortableStoreValue(woundedObject, HELPING_WOUNDED_OBJECT_KEY);
+    const objectHealedBy: Optional<TNumberId> =
+      woundedObject && getPortableStoreValue(woundedObject.id(), HELPING_WOUNDED_OBJECT_KEY);
 
     if (
       // Do not check self.