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

Fix suspicion crash on forcing 0 players readied

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-08-16 19:35:50 +02:00
parent 4ef8bc962e
commit ac9d40b606
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
View File

@@ -41,6 +41,12 @@ namespace Content.Server.GameTicking.GamePresets
return false; return false;
} }
if (readyPlayers.Count == 0)
{
_chatManager.DispatchServerAnnouncement($"No players readied up! Can't start Suspicion.");
return false;
}
var list = new List<IPlayerSession>(readyPlayers); var list = new List<IPlayerSession>(readyPlayers);
var prefList = new List<IPlayerSession>(); var prefList = new List<IPlayerSession>();

6
Content.Shared/SharedGameTicker.cs
View File

@@ -176,7 +176,7 @@ namespace Content.Shared
public TimeSpan RoundDuration; public TimeSpan RoundDuration;
public uint PlayerCount; public int PlayerCount;
public List<RoundEndPlayerInfo> AllPlayersEndInfo; public List<RoundEndPlayerInfo> AllPlayersEndInfo;
@@ -189,9 +189,9 @@ namespace Content.Shared
var seconds = buffer.ReadInt32(); var seconds = buffer.ReadInt32();
RoundDuration = new TimeSpan(hours, mins, seconds); RoundDuration = new TimeSpan(hours, mins, seconds);
PlayerCount = buffer.ReadUInt32(); PlayerCount = buffer.ReadInt32();
AllPlayersEndInfo = new List<RoundEndPlayerInfo>(); AllPlayersEndInfo = new List<RoundEndPlayerInfo>();
for(var i = 0; i < PlayerCount + 1; i++) for(var i = 0; i < PlayerCount; i++)
{ {
var readPlayerData = new RoundEndPlayerInfo var readPlayerData = new RoundEndPlayerInfo
{ {