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

fix #1146 (bogus client lookup)

Browse Source
This commit is contained in:
Chris Forbes
2011-09-11 17:48:32 +12:00
parent ea190fcf86
commit 9de1ed9761
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Traits/ValidateOrder.cs
View File

@@ -22,18 +22,20 @@ namespace OpenRA.Traits
if (order.Subject == null || order.Subject.Owner == null) if (order.Subject == null || order.Subject.Owner == null)
return true; return true;
var subjectClient = order.Subject.Owner.ClientIndex; var subjectClientId = order.Subject.Owner.ClientIndex;
if (subjectClient >= orderManager.LobbyInfo.Clients.Count || subjectClient < 0) var subjectClient = orderManager.LobbyInfo.ClientWithIndex(subjectClientId);
if (subjectClient == null)
{ {
Game.Debug("Order sent to {0}: resolved ClientIndex `{1}` is out of range", order.Subject.Owner.PlayerName, subjectClient); Game.Debug("Order sent to {0}: resolved ClientIndex `{1}` doesn't exist", order.Subject.Owner.PlayerName, subjectClientId);
return false; return false;
} }
// Hack: Assumes bots always run on clientId 0. // Hack: Assumes bots always run on clientId 0.
var isBotOrder = orderManager.LobbyInfo.Clients[subjectClient].Bot != null && clientId == 0; var isBotOrder = subjectClient.Bot != null && clientId == 0;
// Drop exploiting orders // Drop exploiting orders
if (subjectClient != clientId && !isBotOrder) if (subjectClientId != clientId && !isBotOrder)
{ {
Game.Debug("Detected exploit order from client {0}: {1}", clientId, order.OrderString); Game.Debug("Detected exploit order from client {0}: {1}", clientId, order.OrderString);
return false; return false;