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

Merge pull request #3258 from pchote/drop-desync-fix

Browse Source 
Revert "Players and bots surrender on disconnect."
This commit is contained in:
Matthias Mailänder
2013-05-10 23:56:03 -07:00
parent 7d0b7d9617 426467a38f
commit 84d595bcde
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.RA/ConquestVictoryConditions.cs
View File

@@ -10,7 +10,6 @@
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Network;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
@@ -32,29 +31,12 @@ namespace OpenRA.Mods.RA
Info = info; Info = info;
} }
Session.Client HumanClient(Player p)
{
var client = p.World.LobbyInfo.ClientWithIndex(p.ClientIndex);
if (client != null && client.Bot != null)
return p.World.LobbyInfo.ClientWithIndex(client.BotControllerClientIndex);
return client;
}
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (self.Owner.NonCombatant) if (self.Owner.WinState != WinState.Undefined || self.Owner.NonCombatant) return;
return;
// Surrender when the controlling player disconnects
var client = HumanClient(self.Owner);
if (client != null && client.State == Session.ClientState.Disconnected)
Lose(self);
if (self.Owner.WinState != WinState.Undefined)
return;
var hasAnything = self.World.ActorsWithTrait<MustBeDestroyed>() var hasAnything = self.World.ActorsWithTrait<MustBeDestroyed>()
.Any(a => a.Actor.Owner == self.Owner); .Any( a => a.Actor.Owner == self.Owner );
if (!hasAnything && !self.Owner.NonCombatant) if (!hasAnything && !self.Owner.NonCombatant)
Lose(self); Lose(self);
@@ -62,10 +44,9 @@ namespace OpenRA.Mods.RA
var others = self.World.Players.Where( p => !p.NonCombatant var others = self.World.Players.Where( p => !p.NonCombatant
&& p != self.Owner && p.Stances[self.Owner] != Stance.Ally ); && p != self.Owner && p.Stances[self.Owner] != Stance.Ally );
if (others.Count() == 0) if (others.Count() == 0) return;
return;
if (others.All(p => p.WinState == WinState.Lost)) if(others.All(p => p.WinState == WinState.Lost))
Win(self); Win(self);
} }