Merge pull request Ash-LikeSnow#105 from BDCarrillo/master

Negative Ent ID protection
StarCoreSE · Oct 21, 2024 · 958a1db · 958a1db
2 parents d2f491b + 61cada2
commit 958a1db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Data/Scripts/CoreSystems/Session/SessionUpdate.cs b/Data/Scripts/CoreSystems/Session/SessionUpdate.cs
@@ -692,7 +692,7 @@ private void AiLoop()
                                 }
                             }
                         }
-                        else if (eTarget != null && eTarget.MarkedForClose || w.Target.HasTarget && w.Target.TargetObject == null && w.TargetData.EntityId >= 0 || w.DelayedTargetResetTick == Tick && w.TargetData.EntityId == 0 && w.Target.TargetObject != null)
+                        else if (eTarget != null && eTarget.MarkedForClose || w.Target.HasTarget && w.Target.TargetObject == null && (w.TargetData.EntityId >= 0 || w.TargetData.EntityId <= -3) || w.DelayedTargetResetTick == Tick && w.TargetData.EntityId == 0 && w.Target.TargetObject != null)
                         {
                             w.Target.Reset(Tick, States.ServerReset);
                         }

diff --git a/Data/Scripts/CoreSystems/Support/MiscTypes.cs b/Data/Scripts/CoreSystems/Support/MiscTypes.cs
@@ -130,7 +130,7 @@ internal void ClientUpdate(Weapon w, ProtoWeaponTransferTarget tData)
             }
 
             MyEntity targetEntity = null;
-            if (tData.EntityId <= 0 || MyEntities.TryGetEntityById(tData.EntityId, out targetEntity, true))
+            if ((tData.EntityId <= 0 && tData.EntityId >= -2) || MyEntities.TryGetEntityById(tData.EntityId, out targetEntity, true))
             {
                 TargetObject = targetEntity;
 

diff --git a/Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs b/Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs
@@ -473,7 +473,7 @@ private bool TargetExcludedFromVoxelLos(Ai ai, MyEntity target)
                 foreach (var m in Session.I.ActiveMarks)
                 {
                     var grid = m.Item3.TmpEntity as MyCubeGrid;
-                    if ((grid != null || m.Item3.EntityId > 0 && MyEntities.TryGetEntityById(m.Item3.EntityId, out grid) && grid != null) && targetGrid.IsSameConstructAs(grid))
+                    if ((grid != null || (m.Item3.EntityId > 0 || m.Item3.EntityId <= -3)&& MyEntities.TryGetEntityById(m.Item3.EntityId, out grid) && grid != null) && targetGrid.IsSameConstructAs(grid))
                         return true;
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -692,7 +692,7 @@ private void AiLoop() @@
                                     }
                                 }
                             }
-                            else if (eTarget != null && eTarget.MarkedForClose || w.Target.HasTarget && w.Target.TargetObject == null && w.TargetData.EntityId >= 0 || w.DelayedTargetResetTick == Tick && w.TargetData.EntityId == 0 && w.Target.TargetObject != null)
+                            else if (eTarget != null && eTarget.MarkedForClose || w.Target.HasTarget && w.Target.TargetObject == null && (w.TargetData.EntityId >= 0 || w.TargetData.EntityId <= -3) || w.DelayedTargetResetTick == Tick && w.TargetData.EntityId == 0 && w.Target.TargetObject != null)
                             {
                                 w.Target.Reset(Tick, States.ServerReset);
                             }
@@ Expand Down @@