From ef510448405c9a17cfcb221cc1769acc4d865c8f Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 3 Oct 2018 19:14:58 +0200 Subject: [PATCH] Fixed server -> client transport --- Client/Gui/playerlist.js | 11 +++++------ Server/Events/Key.cs | 3 ++- Server/Util/ListPlayer.cs | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Client/Gui/playerlist.js b/Client/Gui/playerlist.js index e7610890..1c689ddf 100644 --- a/Client/Gui/playerlist.js +++ b/Client/Gui/playerlist.js @@ -15,10 +15,9 @@ mp.events.add("showPlayerlist", () => { } }); -mp.events.add("fetchPlayerList", (players) => { - - for (var player in players) - { - mp.gui.chat.push(player["Id"] + ", " + player["Name"] + ", " + player["Ping"]) - } +mp.events.add("fetchPlayerList", (playersJson) => { + var players = JSON.parse(playersJson); + players.forEach((player) => { + mp.gui.chat.push(player.Id + ", " + player.Name + ", " + player.Ping); + }); }); \ No newline at end of file diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs index 9f150ff8..cbe9e732 100644 --- a/Server/Events/Key.cs +++ b/Server/Events/Key.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; +using Newtonsoft.Json; using reallife_gamemode.Server.Util; /** * @overview Life of German Reallife - Event Key (Key.cs) @@ -28,7 +29,7 @@ namespace reallife_gamemode.Server.Events ListPlayers.Add(lPlayer); } - player.TriggerEvent("fetchPlayerList", ListPlayers); + player.TriggerEvent("fetchPlayerList", JsonConvert.SerializeObject(ListPlayers)); } [RemoteEvent("keyPress:N")] public void KeyPressN(Client player) diff --git a/Server/Util/ListPlayer.cs b/Server/Util/ListPlayer.cs index 8de40e6c..40ea85c4 100644 --- a/Server/Util/ListPlayer.cs +++ b/Server/Util/ListPlayer.cs @@ -11,10 +11,10 @@ using GTANetworkAPI; namespace reallife_gamemode.Server.Util { - public class ListPlayer : Script + public class ListPlayer { - public int Id; - public string Name; - public int Ping; + public int Id { get; set; } + public string Name { get; set; } + public int Ping { get; set; } } }