DirectEve.ActiveShip.Entity now returns null when no entity has been …

…found Questor has been fixed to properly handle this.
BoardBoy · Mar 22, 2011 · 16b7935 · 16b7935
1 parent 2fed920
commit 16b7935
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/DirectEve/DirectEve.dll b/DirectEve/DirectEve.dll
diff --git a/Questor.Modules/Cache.cs b/Questor.Modules/Cache.cs
@@ -325,7 +325,7 @@ public bool InStation
 
         public bool InWarp
         {
-            get { return DirectEve.ActiveShip.Entity.Mode == 3; }
+            get { return DirectEve.ActiveShip.Entity != null ? DirectEve.ActiveShip.Entity.Mode == 3 : false; }
         }
 
         public IEnumerable<EntityCache> ActiveDrones
@@ -377,7 +377,7 @@ public EntityCache Approaching
                 if (_approaching == null)
                 {
                     var ship = DirectEve.ActiveShip.Entity;
-                    if (ship.IsValid)
+                    if (ship != null && ship.IsValid)
                         _approaching = EntityById(ship.FollowId);
                 }
 
@@ -671,6 +671,9 @@ public void AddPriorityTargets(IEnumerable<EntityCache> targets, Priority priori
         /// <returns></returns>
         public double DistanceFromMe(double x, double y, double z)
         {
+            if (DirectEve.ActiveShip.Entity == null)
+                return 0;
+
             var curX = DirectEve.ActiveShip.Entity.X;
             var curY = DirectEve.ActiveShip.Entity.Y;
             var curZ = DirectEve.ActiveShip.Entity.Z;

diff --git a/Questor.Modules/Combat.cs b/Questor.Modules/Combat.cs
@@ -519,6 +519,10 @@ public void ProcessState()
             if (Cache.Instance.InStation)
                 return;
 
+            // What? No ship entity?
+            if (Cache.Instance.DirectEve.ActiveShip.Entity == null)
+                return;
+
             // There is no combat when cloaked
             if (Cache.Instance.DirectEve.ActiveShip.Entity.IsCloaked)
                 return;

diff --git a/Questor.Modules/Defense.cs b/Questor.Modules/Defense.cs
@@ -76,6 +76,10 @@ public void ProcessState()
             if (Cache.Instance.InStation)
                 return;
 
+            // What? No ship entity?
+            if (Cache.Instance.DirectEve.ActiveShip.Entity == null)
+                return;
+
             // There is no better defense then being cloaked ;)
             if (Cache.Instance.DirectEve.ActiveShip.Entity.IsCloaked)
                 return;

diff --git a/Questor.Modules/EntityCache.cs b/Questor.Modules/EntityCache.cs
@@ -337,8 +337,11 @@ public bool HaveLootRights
                 if (_directEntity != null)
                 {
                     var haveLootRights = false;
-                    haveLootRights |= _directEntity.CorpId == Cache.Instance.DirectEve.ActiveShip.Entity.CorpId;
-                    haveLootRights |= _directEntity.OwnerId == Cache.Instance.DirectEve.ActiveShip.Entity.CharId;
+                    if (Cache.Instance.DirectEve.ActiveShip.Entity != null)
+                    {
+                        haveLootRights |= _directEntity.CorpId == Cache.Instance.DirectEve.ActiveShip.Entity.CorpId;
+                        haveLootRights |= _directEntity.OwnerId == Cache.Instance.DirectEve.ActiveShip.Entity.CharId;
+                    }
 
                     return haveLootRights;
                 }

diff --git a/Questor.Modules/MissionController.cs b/Questor.Modules/MissionController.cs
@@ -504,6 +504,10 @@ private void PerformAction(Action action)
 
         public void ProcessState()
         {
+            // What? No ship entity?
+            if (Cache.Instance.DirectEve.ActiveShip.Entity == null)
+                return;
+
             switch (State)
             {
                 case MissionControllerState.Idle:

diff --git a/Questor.Modules/Panic.cs b/Questor.Modules/Panic.cs
@@ -27,9 +27,12 @@ public void ProcessState()
             switch (State)
             {
                 case PanicState.Normal:
-                    _lastNormalX = Cache.Instance.DirectEve.ActiveShip.Entity.X;
-                    _lastNormalY = Cache.Instance.DirectEve.ActiveShip.Entity.Y;
-                    _lastNormalZ = Cache.Instance.DirectEve.ActiveShip.Entity.Z;
+                    if (Cache.Instance.DirectEve.ActiveShip.Entity != null)
+                    {
+                        _lastNormalX = Cache.Instance.DirectEve.ActiveShip.Entity.X;
+                        _lastNormalY = Cache.Instance.DirectEve.ActiveShip.Entity.Y;
+                        _lastNormalZ = Cache.Instance.DirectEve.ActiveShip.Entity.Z;
+                    }
 
                     if (Cache.Instance.DirectEve.ActiveShip.GroupId == (int) Group.Capsule)
                     {