From c2dd232e9ca5dc8a504ad7529a0c1aa90b48190f Mon Sep 17 00:00:00 2001
From: Casper Warden <216465704+casperwardensl@users.noreply.github.com>
Date: Wed, 20 Apr 2022 11:37:38 +0100
Subject: [PATCH] Handle circuit shutdowns better

---
 lib/classes/ObjectResolver.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/classes/ObjectResolver.ts b/lib/classes/ObjectResolver.ts
index f7c7e20..e0e89e6 100644
--- a/lib/classes/ObjectResolver.ts
+++ b/lib/classes/ObjectResolver.ts
@@ -181,6 +181,10 @@ export class ObjectResolver
                 }
             });
 
+            if (!this.region)
+            {
+                return;
+            }
             objProps = this.region.clientEvents.onObjectResolvedEvent.subscribe((obj: ObjectResolvedEvent) =>
             {
                 if (objs[obj.object.ID] !== undefined)
@@ -292,8 +296,17 @@ export class ObjectResolver
             if (objectList.length > 0)
             {
                 // console.log('Selecting ' + objectList.length + ' objects');
+                if (!this.region)
+                {
+                    return;
+                }
                 await this.region.clientCommands.region.selectObjects(objectList);
                 // console.log('Deselecting ' + objectList.length + ' objects');
+
+                if (!this.region)
+                {
+                    return;
+                }
                 await this.region.clientCommands.region.deselectObjects(objectList);
                 for (const chk of objectList)
                 {
@@ -390,6 +403,10 @@ export class ObjectResolver
                     const costs = result[key];
                     try
                     {
+                        if (!that.region)
+                        {
+                            return;
+                        }
                         const obj: GameObject = that.region.objects.getObjectByUUID(new UUID(key));
                         obj.linkPhysicsImpact = parseFloat(costs['linked_set_physics_cost']);
                         obj.linkResourceImpact = parseFloat(costs['linked_set_resource_cost']);