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

Merge pull request #3311 from chrisforbes/placebuilding-resolve

Browse Source 
validate building placement in ResolveOrder as well
This commit is contained in:
Curtis Shmyr
2013-05-17 21:14:53 -07:00
parent cfcccb590d 4d85605cca
commit 9772f9b770
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Player/PlaceBuilding.cs
View File

@@ -62,7 +62,8 @@ namespace OpenRA.Mods.RA
} }
else else
{ {
if (!self.World.CanPlaceBuilding(order.TargetString, buildingInfo, order.TargetLocation, null)) if (!self.World.CanPlaceBuilding(order.TargetString, buildingInfo, order.TargetLocation, null)
|| !buildingInfo.IsCloseEnoughToBase(self.World, order.Player, order.TargetString, order.TargetLocation))
{ {
return; return;
} }

6
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -91,6 +91,12 @@ namespace OpenRA.Mods.RA.Server
{ "startgame", { "startgame",
s => s =>
{ {
if (!client.IsAdmin)
{
server.SendOrderTo(conn, "Message", "Only the host can start the game");
return true;
}
if (server.lobbyInfo.Slots.Any(sl => sl.Value.Required && if (server.lobbyInfo.Slots.Any(sl => sl.Value.Required &&
server.lobbyInfo.ClientInSlot(sl.Key) == null)) server.lobbyInfo.ClientInSlot(sl.Key) == null))
{ {