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

change exploit order check to cope with PlayerId not matching ClientId, because it doesnt.

Browse Source
This commit is contained in:
Chris Forbes
2010-08-24 18:51:25 +12:00
parent 6ae7da77ae
commit d744cfe21b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -19,8 +19,11 @@ namespace OpenRA.Network
public static void ProcessOrder( World world, int clientId, Order order ) public static void ProcessOrder( World world, int clientId, Order order )
{ {
// Drop exploiting orders // Drop exploiting orders
if (order.Subject != null && order.Subject.Owner != world.players[clientId]) if (order.Subject != null && order.Subject.Owner.ClientIndex != clientId)
{
Game.Debug("Detected exploit order from {0}: {1}".F(clientId, order.OrderString));
return; return;
}
switch( order.OrderString ) switch( order.OrderString )
{ {

10
OpenRA.Game/Player.cs
View File

@@ -35,7 +35,8 @@ namespace OpenRA
public readonly string InternalName; public readonly string InternalName;
public readonly CountryInfo Country; public readonly CountryInfo Country;
public readonly int Index; public readonly int Index;
public readonly bool NonCombatant = false; public readonly bool NonCombatant = false;
public readonly int ClientIndex;
public ShroudRenderer Shroud; public ShroudRenderer Shroud;
public World World { get; private set; } public World World { get; private set; }
@@ -50,7 +51,8 @@ namespace OpenRA
Index = index; Index = index;
Palette = "player"+index; Palette = "player"+index;
Color = pr.Color; Color = pr.Color;
Color2 = pr.Color2; Color2 = pr.Color2;
ClientIndex = 0; /* it's a map player, "owned" by host */
PlayerName = InternalName = pr.Name; PlayerName = InternalName = pr.Name;
NonCombatant = pr.NonCombatant; NonCombatant = pr.NonCombatant;
@@ -75,7 +77,9 @@ namespace OpenRA
InternalName = "Multi{0}".F(client.Index); InternalName = "Multi{0}".F(client.Index);
Country = world.GetCountries() Country = world.GetCountries()
.FirstOrDefault(c => client != null && client.Country == c.Race) .FirstOrDefault(c => client != null && client.Country == c.Race)
?? world.GetCountries().Random(world.SharedRandom); ?? world.GetCountries().Random(world.SharedRandom);
ClientIndex = client.Index;
RegisterPlayerColor(world, Palette); RegisterPlayerColor(world, Palette);
} }