RedGuy/RMafia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix players list crash

Browse Source
This commit is contained in:
Ilya 2021-03-04 19:48:16 +03:00
parent 96171d4d70
commit 7e6669c01f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MafiaClient/MainWindow.axaml.cs
View File

@ -265,20 +265,25 @@ namespace MafiaClient
private void GameDaySelect_OnMouseDoubleClick(object sender, RoutedEventArgs e) private void GameDaySelect_OnMouseDoubleClick(object sender, RoutedEventArgs e)
{ {
ListBoxItem selected = (ListBoxItem)(this.FindControl<ListBox>("GameDaySelect").SelectedItem); if (this.FindControl<ListBox>("GameDaySelect").SelectedItem != null)
App.Instance.Connection.Vote(Convert.ToInt32(((string)selected.Content).Split(")")[0])); {
ListBoxItem selected = (ListBoxItem) (this.FindControl<ListBox>("GameDaySelect").SelectedItem);
App.Instance.Connection.Vote(Convert.ToInt32(((string) selected.Content).Split(")")[0]));
}
} }
public void ShowDay(bool voting, Role role, List<Player> players) public void ShowDay(bool voting, Role role, List<Player> players)
{ {
this.FindControl<ListBox>("GameDaySelect").IsEnabled = voting; this.FindControl<ListBox>("GameDaySelect").IsEnabled = voting;
if (players.Count != 0)
{
List<ListBoxItem> items = new List<ListBoxItem>(); List<ListBoxItem> items = new List<ListBoxItem>();
foreach (Player player in players) foreach (Player player in players)
{ {
items.Add(new ListBoxItem {Content = player.Id.ToString() + ") " + player.Name}); items.Add(new ListBoxItem {Content = player.Id + ") " + player.Name});
} }
this.FindControl<ListBox>("GameDaySelect").Items = items; this.FindControl<ListBox>("GameDaySelect").Items = items;
}
if (role == Role.Died) if (role == Role.Died)
{ {

4
MafiaServer/Game.cs
View File

@ -223,9 +223,11 @@ namespace MafiaServer
_votesRemain.Add(player); _votesRemain.Add(player);
} }
List<Player> players = GetPlayersRoles();
foreach (var player in _players) foreach (var player in _players)
{ {
player.SendPacket(new GameStageChangedPacket(GameState.VotingDay, player.Role, GetPlayersRoles())); player.SendPacket(new GameStageChangedPacket(GameState.VotingDay, player.Role, players));
player.SendPacket(new MessageReceivePacket(ChatType.Day, true, "System", "Начинаем голосование!")); player.SendPacket(new MessageReceivePacket(ChatType.Day, true, "System", "Начинаем голосование!"));
} }
} }