From 1a424261ea51487950838cacc11eda2345eba523 Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Tue, 21 May 2019 18:35:09 +0200
Subject: [PATCH] move keys J -> O (Online), 2 -> J (Job)

---
 ReallifeGamemode.Client/Player/keys.ts |  8 ++++----
 ReallifeGamemode.Server/Events/Key.cs  | 25 +++++++++----------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts
index 5c0e4779..99cc6feb 100644
--- a/ReallifeGamemode.Client/Player/keys.ts
+++ b/ReallifeGamemode.Client/Player/keys.ts
@@ -94,10 +94,10 @@ export default function keys(globalData: GlobalData) {
         }
     });
 
-    //J //Spielerliste
-    mp.keys.bind(0x4A, false, function () {
+    //O //Spielerliste
+    mp.keys.bind(0x4F, false, function () {
         if (!globalData.InChat) {
-            mp.events.callRemote("keyPress:J");
+            mp.events.callRemote("keyPress:O");
             //mp.events.call("showPlayerlist"); 
         }
     });
@@ -140,7 +140,7 @@ export default function keys(globalData: GlobalData) {
     });
 
     //2 // Job Starten
-    mp.keys.bind(0x32, false, () => {
+    mp.keys.bind(0x4A, false, () => {
         if (!globalData.InChat && !globalData.InInput && !globalData.InMenu && globalData.LoggedIn) {
             mp.events.callRemote("CLIENT:JobManager_ShowJobMenu");
         }
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 6695c63f..6c4080d2 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -44,7 +44,7 @@ namespace ReallifeGamemode.Server.Events
                             "0", "200", true.ToString(), 0.ToString(), 0.ToString());
                         player.SendNotification("~y~ATM~s~ erstellt!", false);
                         break;
-                }               
+                }
             }
 
             GroundItem.PickUpGroundItem(player);
@@ -112,7 +112,7 @@ namespace ReallifeGamemode.Server.Events
                 factionRank = u.GetFactionRank().RankName,
                 group = u.Group?.Name ?? "Keine",
                 groupRank = u.GroupRank.GetName(),
-                job = JobManager.GetJob(u.JobId ?? 0)?.Name ?? "Keiner" 
+                job = JobManager.GetJob(u.JobId ?? 0)?.Name ?? "Keiner"
             };
 
             string faction = u.FactionLeader ? u.Faction.Name : null;
@@ -201,25 +201,18 @@ namespace ReallifeGamemode.Server.Events
             InventoryManager.GetUserItems(player);
         }
 
-        [RemoteEvent("keyPress:J")]
+        [RemoteEvent("keyPress:O")]
         public void KeyPressJ(Client player)
         {
             if (!player.IsLoggedIn()) return;
             List<Client> players = NAPI.Pools.GetAllPlayers();
-            List<ListPlayer> ListPlayers = new List<ListPlayer>();
-
-            foreach (Client listPlayer in players)
+            var listPlayers = players.Select(p => new
             {
-                var lPlayer = new ListPlayer
-                {
-                    Id = listPlayer.Handle.Value,
-                    Name = listPlayer.Name,
-                    Ping = listPlayer.Ping
-                };
-
-                ListPlayers.Add(lPlayer);
-            }
-            player.TriggerEvent("fetchPlayerList", JsonConvert.SerializeObject(ListPlayers));
+                Id = p.Handle.Value,
+                p.Name,
+                p.Ping
+            });
+            player.TriggerEvent("fetchPlayerList", JsonConvert.SerializeObject(listPlayers));
         }
 
         [RemoteEvent("keyPress:K")]