aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix online list show faction

Browse Source
This commit is contained in:
CroniX
2021-01-23 17:06:09 +01:00
parent 9b5fcffdf6
commit dfc9be29c6
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/Gui/playerlist.ts
View File

@@ -9,7 +9,7 @@ export default function playerList(globalData: IGlobalData): void {
var playerlistBrowser: BrowserMp = null; var playerlistBrowser: BrowserMp = null;
var pList; var pList;
mp.events.add("showPlayerlist", (playersJson, factionname) => { mp.events.add("showPlayerlist", (playersJson) => {
if (playerlistBrowser !== null) { if (playerlistBrowser !== null) {
playerlistBrowser.destroy(); playerlistBrowser.destroy();
@@ -25,7 +25,7 @@ export default function playerList(globalData: IGlobalData): void {
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
pList = JSON.parse(playersJson); pList = JSON.parse(playersJson);
pList.forEach((player) => { pList.forEach((player) => {
playerlistBrowser.execute(`ad_row('${JSON.stringify(player.Id)}','${JSON.stringify(player.Name)}',${JSON.stringify(factionname)},'${JSON.stringify(player.Ping)}');`); playerlistBrowser.execute(`ad_row('${JSON.stringify(player.Id)}','${JSON.stringify(player.Name)}',${JSON.stringify(player.FactionName)},'${JSON.stringify(player.Ping)}');`);
}); });
} }
}); });

17
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -609,16 +609,17 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
string factionname = player.GetUser(dbContext).Faction.Name; string FactionName;
List<Player> players = NAPI.Pools.GetAllPlayers(); List<Player> players = NAPI.Pools.GetAllPlayers();
var listPlayers = players.Select(p => new var listPlayers = players.Select(p => new
{ {
Id = p.Handle.Value, Id = p.Handle.Value,
p.Name, p.Name,
p.Ping, p.Ping,
}) ; FactionName = p.GetUser().Faction.Name,
player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers), JsonConvert.SerializeObject(factionname)); }) ;
player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers));
} }
} }