epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10696 from RoosterDragon/self-assumed-not-null

Browse Source 
Remove null checks against self
This commit is contained in:
Oliver Brakmann
2016-02-06 21:22:52 +01:00
parent 8588f36575 4b308dee02
commit 870867760a
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -179,7 +179,6 @@ namespace OpenRA.Mods.Common.Traits
static bool IsMovingInMyDirection(Actor self, Actor other) static bool IsMovingInMyDirection(Actor self, Actor other)
{ {
if (!other.IsMoving()) return false; if (!other.IsMoving()) return false;
if (self == null) return true;
var selfMobile = self.TraitOrDefault<Mobile>(); var selfMobile = self.TraitOrDefault<Mobile>();
if (selfMobile == null) return false; if (selfMobile == null) return false;
@@ -235,7 +234,6 @@ namespace OpenRA.Mods.Common.Traits
// If the check allows: we are not blocked by allied units moving in our direction. // If the check allows: we are not blocked by allied units moving in our direction.
if (!check.HasCellCondition(CellConditions.BlockedByMovers) && if (!check.HasCellCondition(CellConditions.BlockedByMovers) &&
self != null &&
self.Owner.Stances[otherActor.Owner] == Stance.Ally && self.Owner.Stances[otherActor.Owner] == Stance.Ally &&
IsMovingInMyDirection(self, otherActor)) IsMovingInMyDirection(self, otherActor))
return false; return false;
@@ -246,7 +244,7 @@ namespace OpenRA.Mods.Common.Traits
return false; return false;
// If we cannot crush the other actor in our way, we are blocked. // If we cannot crush the other actor in our way, we are blocked.
if (self == null || Crushes == null || Crushes.Count == 0) if (Crushes == null || Crushes.Count == 0)
return true; return true;
// If the other actor in our way cannot be crushed, we are blocked. // If the other actor in our way cannot be crushed, we are blocked.