From ddffff8817cf36983d9360d128b2e936a8d334e2 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 25 Jan 2021 14:33:53 +0100 Subject: [PATCH] fix Cronix olist --- ReallifeGamemode.Server/Events/Key.cs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 2ec51b14..64d09e40 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -613,14 +613,29 @@ namespace ReallifeGamemode.Server.Events { if (!player.IsLoggedIn()) return; List players = NAPI.Pools.GetAllPlayers(); - var listPlayers = players.Select(p => new + if(player.GetUser().Faction != null) + { + var listPlayers = players.Select(p => new { Id = p.Handle.Value, p.Name, p.Ping, FactionName = p.GetUser().Faction.Name, }) ; - player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers)); + player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers)); + } + else + { + var listPlayers = players.Select(p => new + { + Id = p.Handle.Value, + p.Name, + p.Ping, + FactionName = "Zivilist", + }); + player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers)); + } + } [RemoteEvent("keyPress:K")]