tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes observing from lobby nullspacing people on round restart

Browse Source 
Fixes #2791
This commit is contained in:
Vera Aguilera Puerto
2020-12-21 12:25:25 +01:00
parent 131f7ac6cc
commit d684198b00
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/GameTicking/GameTicker.cs
View File

@@ -390,7 +390,7 @@ namespace Content.Server.GameTicking
public void Respawn(IPlayerSession targetPlayer)
{
targetPlayer.ContentData().WipeMind();
targetPlayer.ContentData()?.WipeMind();
if (LobbyEnabled)
_playerJoinLobby(targetPlayer);
@@ -683,26 +683,32 @@ namespace Content.Server.GameTicking
{
// Delete all entities.
foreach (var entity in _entityManager.GetEntities().ToList())
{
// TODO: Maybe something less naive here?
// FIXME: Actually, definitely.
entity.Delete();
}
_mapManager.Restart();
// Delete the minds of everybody.
// TODO: Maybe move this into a separate manager?
foreach (var unCastData in PlayerManager.GetAllPlayerData()) unCastData.ContentData().WipeMind();
foreach (var unCastData in PlayerManager.GetAllPlayerData())
{
unCastData.ContentData()?.WipeMind();
}
// Clear up any game rules.
foreach (var rule in _gameRules) rule.Removed();
foreach (var rule in _gameRules)
{
rule.Removed();
}
_gameRules.Clear();
// Move everybody currently in the server to lobby.
foreach (var player in PlayerManager.GetAllPlayers())
{
if (_playersInLobby.ContainsKey(player)) continue;
_playerJoinLobby(player);
}
@@ -949,7 +955,7 @@ namespace Content.Server.GameTicking
private void _playerJoinLobby(IPlayerSession session)
{
_playersInLobby.Add(session, PlayerStatus.NotReady);
_playersInLobby[session] = PlayerStatus.NotReady;
_netManager.ServerSendMessage(_netManager.CreateNetMessage<MsgTickerJoinLobby>(), session.ConnectedClient);
_netManager.ServerSendMessage(_getStatusMsg(session), session.ConnectedClient);
@@ -962,7 +968,9 @@ namespace Content.Server.GameTicking
{
_chatManager.DispatchServerMessage(session,
"Welcome to Space Station 14! If this is your first time checking out the game, be sure to check out the tutorial in the top left!");
if (_playersInLobby.ContainsKey(session)) _playersInLobby.Remove(session);
if (_playersInLobby.ContainsKey(session))
_playersInLobby.Remove(session);
_netManager.ServerSendMessage(_netManager.CreateNetMessage<MsgTickerJoinGame>(), session.ConnectedClient);
}