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

Merge pull request #11152 from abcdefg30/lobbyNote

Browse Source 
Fix reselecting a dropdown option in the lobby causing a server message
This commit is contained in:
Oliver Brakmann
2016-04-20 20:34:40 +02:00
parent 7a13fb189c ea68fbdd7c
commit eb2d7016b5
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -612,6 +612,9 @@ namespace OpenRA.Mods.Common.Server
{ "difficulty",
s =>
{
if (server.LobbyInfo.GlobalSettings.Difficulty == s)
return true;
if (!client.IsAdmin)
{
server.SendOrderTo(conn, "Message", "Only the host can set that option.");
@@ -664,6 +667,9 @@ namespace OpenRA.Mods.Common.Server
return true;
}
if (server.LobbyInfo.GlobalSettings.StartingUnitsClass == selectedClass.Class)
return true;
server.LobbyInfo.GlobalSettings.StartingUnitsClass = selectedClass.Class;
server.SyncLobbyGlobalSettings();
server.SendMessage("{0} changed Starting Units to {1}.".F(client.Name, selectedClass.ClassName));
@@ -696,6 +702,9 @@ namespace OpenRA.Mods.Common.Server
return true;
}
if (server.LobbyInfo.GlobalSettings.StartingCash == requestedCash)
return true;
server.LobbyInfo.GlobalSettings.StartingCash = requestedCash;
server.SyncLobbyGlobalSettings();
server.SendMessage("{0} changed Starting Cash to ${1}.".F(client.Name, requestedCash));
@@ -706,6 +715,9 @@ namespace OpenRA.Mods.Common.Server
{ "techlevel",
s =>
{
if (server.LobbyInfo.GlobalSettings.TechLevel == s)
return true;
if (!client.IsAdmin)
{
server.SendOrderTo(conn, "Message", "Only the host can set that option.");
@@ -737,6 +749,9 @@ namespace OpenRA.Mods.Common.Server
{ "gamespeed",
s =>
{
if (server.LobbyInfo.GlobalSettings.GameSpeedType == s)
return true;
if (!client.IsAdmin)
{
server.SendOrderTo(conn, "Message", "Only the host can set that option.");