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

Prevent game from starting with unavailable map

Browse Source
This commit is contained in:
Gustas
2022-05-08 22:53:38 +03:00
committed by Matthias Mailänder
parent 7f404f64a6
commit 43e0cca663
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,6 +259,22 @@ namespace OpenRA.Mods.Common.Server
if (server.LobbyInfo.Slots.All(sl => server.LobbyInfo.ClientInSlot(sl.Key) == null)) if (server.LobbyInfo.Slots.All(sl => server.LobbyInfo.ClientInSlot(sl.Key) == null))
return; return;
// Does the host have the map installed?
if (server.Type != ServerType.Dedicated && server.ModData.MapCache[server.Map.Uid].Status != MapStatus.Available)
{
// Client 0 will always be the Host
// In some cases client 0 doesn't exist, so we untick all players
var host = server.LobbyInfo.Clients.FirstOrDefault(c => c.Index == 0);
if (host != null)
host.State = Session.ClientState.NotReady;
else
foreach (var client in server.LobbyInfo.Clients)
client.State = Session.ClientState.NotReady;
server.SyncLobbyClients();
return;
}
if (LobbyUtils.InsufficientEnabledSpawnPoints(server.Map, server.LobbyInfo)) if (LobbyUtils.InsufficientEnabledSpawnPoints(server.Map, server.LobbyInfo))
return; return;

1
OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs
View File

@@ -173,6 +173,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
retry.OnClick = () => retry.OnClick = () =>
{ {
modData.MapCache.UpdateMaps();
var (map, _) = getMap(); var (map, _) = getMap();
if (map.Status == MapStatus.DownloadError) if (map.Status == MapStatus.DownloadError)
{ {