cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refresh Lobby Info Box (#7521)

This commit is contained in:
Radosvik 2022-04-15 13:55:38 -05:00 committed by GitHub
parent ef4cc598ce
commit 353a7aa210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/GameTicking/Commands/ForcePresetCommand.cs
View File

@ -38,6 +38,7 @@ namespace Content.Server.GameTicking.Commands
ticker.SetGamePreset(type, true);
shell.WriteLine($"Forced the game to start with preset {name}.");
ticker.UpdateInfoText();
}
}
}

2
Content.Server/GameTicking/GameTicker.Lobby.cs
View File

@ -28,7 +28,7 @@ namespace Content.Server.GameTicking
public IReadOnlyDictionary<IPlayerSession, LobbyPlayerStatus> PlayersInLobby => _playersInLobby;
public IReadOnlySet<NetUserId> PlayersInGame => _playersInGame;
private void UpdateInfoText()
public void UpdateInfoText()
{
RaiseNetworkEvent(GetInfoMsg(), Filter.Empty().AddPlayers(_playersInLobby.Keys));
}

2
Content.Server/GameTicking/GameTicker.Player.cs
View File

@ -106,6 +106,8 @@ namespace Content.Server.GameTicking
break;
}
}
//When the status of a player changes, update the server info text
UpdateInfoText();
async void SpawnWaitPrefs()
{

6
Content.Server/Maps/GameMapManager.cs
View File

@ -87,6 +87,8 @@ public sealed class GameMapManager : IGameMapManager
_currentMap = map;
_currentMapForced = false;
var ticker = EntitySystem.Get<GameTicking.GameTicker>();
ticker.UpdateInfoText();
return true;
}
@ -97,6 +99,8 @@ public sealed class GameMapManager : IGameMapManager
throw new ArgumentException($"The map \"{gameMap}\" is invalid!");
_currentMap = map;
_currentMapForced = true;
var ticker = EntitySystem.Get<GameTicking.GameTicker>();
ticker.UpdateInfoText();
}
public void SelectRandomMap()
@ -104,6 +108,8 @@ public sealed class GameMapManager : IGameMapManager
var maps = CurrentlyEligibleMaps().ToList();
_currentMap = _random.Pick(maps);
_currentMapForced = false;
var ticker = EntitySystem.Get<GameTicking.GameTicker>();
ticker.UpdateInfoText();
}
public GameMapPrototype GetSelectedMap()

3
Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
View File

@ -42,7 +42,8 @@ namespace Content.Server.Voting.Managers
default:
throw new ArgumentOutOfRangeException(nameof(voteType), voteType, null);
}
var ticker = EntitySystem.Get<GameTicker>();
ticker.UpdateInfoText();
TimeoutStandardVote(voteType);
}