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

Moved RejectsOrders and ValidateOrder from Game to Mods.Common

Browse Source
This commit is contained in:
reaperrr
2016-05-26 11:37:39 +02:00
parent bdb7c80f42
commit 54891ed4bd
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -174,13 +174,11 @@
<Compile Include="Traits\DrawLineToTarget.cs" />
<Compile Include="Traits\EditorTilesetFilter.cs" />
<Compile Include="Traits\LintAttributes.cs" />
<Compile Include="Traits\RejectsOrders.cs" />
<Compile Include="Traits\Player\DeveloperMode.cs" />
<Compile Include="Traits\Player\PlayerResources.cs" />
<Compile Include="Traits\Selectable.cs" />
<Compile Include="Traits\Target.cs" />
<Compile Include="Traits\TraitsInterfaces.cs" />
<Compile Include="Traits\ValidateOrder.cs" />
<Compile Include="Traits\World\Faction.cs" />
<Compile Include="Traits\World\ResourceType.cs" />
<Compile Include="Traits\World\ScreenShaker.cs" />

45
OpenRA.Game/Traits/RejectsOrders.cs
View File

@@ -1,45 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
namespace OpenRA.Traits
{
[Desc("Can be used to make a unit partly uncontrollable by the player.")]
public class RejectsOrdersInfo : ITraitInfo
{
[Desc("Possible values include Attack, AttackMove, Guard, Move.")]
public readonly HashSet<string> Except = new HashSet<string>();
public object Create(ActorInitializer init) { return new RejectsOrders(this); }
}
public class RejectsOrders
{
public HashSet<string> Except { get { return info.Except; } }
readonly RejectsOrdersInfo info;
public RejectsOrders(RejectsOrdersInfo info)
{
this.info = info;
}
}
public static class RejectsOrdersExts
{
public static bool AcceptsOrder(this Actor self, string orderString)
{
var r = self.TraitOrDefault<RejectsOrders>();
return r == null || r.Except.Contains(orderString);
}
}
}

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

@@ -1,47 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using OpenRA.Network;
namespace OpenRA.Traits
{
[Desc("Used to detect exploits. Attach this to the world actor.")]
public class ValidateOrderInfo : TraitInfo<ValidateOrder> { }
public class ValidateOrder : IValidateOrder
{
public bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order)
{
if (order.Subject == null || order.Subject.Owner == null)
return true;
var subjectClientId = order.Subject.Owner.ClientIndex;
var subjectClient = orderManager.LobbyInfo.ClientWithIndex(subjectClientId);
if (subjectClient == null)
{
Game.Debug("Order sent to {0}: resolved ClientIndex `{1}` doesn't exist", order.Subject.Owner.PlayerName, subjectClientId);
return false;
}
var isBotOrder = subjectClient.Bot != null && clientId == subjectClient.BotControllerClientIndex;
// Drop exploiting orders
if (subjectClientId != clientId && !isBotOrder)
{
Game.Debug("Detected exploit order from client {0}: {1}", clientId, order.OrderString);
return false;
}
return order.Subject.AcceptsOrder(order.OrderString);
}
}
}