From c169bc3c5136fd0cb603d14025b6a5b4556b7de0 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 7 Jan 2012 19:09:51 +1300 Subject: [PATCH] fix #1320 bogus use of Game.CosmeticRandom from server thread --- OpenRA.Game/Server/Server.cs | 1 + OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 54863fdc1d..319769579d 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -40,6 +40,7 @@ namespace OpenRA.Server public readonly IPAddress Ip; public readonly int Port; int randomSeed; + public readonly Thirdparty.Random Random = new Thirdparty.Random(); public ServerSettings Settings; public ModData ModData; diff --git a/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs index 5914d46e93..20cfd55f6d 100644 --- a/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs +++ b/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs @@ -210,9 +210,9 @@ namespace OpenRA.Mods.RA.Server }; // pick a random color for the bot - var hue = (byte)Game.CosmeticRandom.Next(255); - var sat = (byte)Game.CosmeticRandom.Next(255); - var lum = (byte)Game.CosmeticRandom.Next(51,255); + var hue = (byte)server.Random.Next(255); + var sat = (byte)server.Random.Next(255); + var lum = (byte)server.Random.Next(51,255); bot.ColorRamp = new ColorRamp(hue, sat, lum, 10); server.lobbyInfo.Clients.Add(bot);