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

Merge pull request #2986 from chrisforbes/autotarget-desync

Browse Source 
fix desync in Cloak.IsVisible
This commit is contained in:
Curtis Shmyr
2013-04-06 22:26:25 -07:00
parent ece611e5c8 3b95708811
commit f2668b8831
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/Cloak.cs
View File

@@ -99,19 +99,12 @@ namespace OpenRA.Mods.RA
if (!Cloaked)
return true;
if (s != null)
{
if (s == self.World.LocalShroud && s.Observing)
if (s.Observing)
return true;
if (s.Owner != null)
if (self.Owner == s.Owner || self.Owner.Stances[s.Owner] == Stance.Ally)
return true;
if (s.Owner != null)
if (self.Owner == s.Owner || self.Owner.Stances[s.Owner] == Stance.Ally)
return true;
}
if (self.World.LocalPlayer != null)
if (self.Owner == self.World.LocalPlayer || self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally)
return true;
return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
a.Actor.Owner.Stances[self.Owner] != Stance.Ally &&
(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);