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

fix onlineliste

Browse Source
This commit is contained in:
michael.reiswich
2021-03-25 12:01:47 +01:00
parent 4464630368
commit 87dbc00ccc
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReallifeGamemode.Client/inputhelper/index.ts
View File

@@ -48,6 +48,7 @@ export default class InputHelper {
clearInterval(disableInputTimer); clearInterval(disableInputTimer);
mp.events.remove('cef_inputhelper_sendvalue'); mp.events.remove('cef_inputhelper_sendvalue');
mp.events.remove('cef_request_title'); mp.events.remove('cef_request_title');
mp.events.remove('closeinputhelper');
this.browser.destroy(); this.browser.destroy();
this.data.InInput = false; this.data.InInput = false;
this.data.InMenu = false; this.data.InMenu = false;

5
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -85,11 +85,6 @@ namespace ReallifeGamemode.Server.Commands
[Command("hub")] [Command("hub")]
public void CmdAnim(Player player) public void CmdAnim(Player player)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable)); player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable));
} }
} }

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

@@ -617,30 +617,15 @@ namespace ReallifeGamemode.Server.Events
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers(); List<Player> players = NAPI.Pools.GetAllPlayers();
if(player.GetUser().Faction != null)
{
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, FactionName = p.GetUser().Faction?.Name ?? "Zivilist",
}) ; }) ;
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")] [RemoteEvent("keyPress:K")]
public void KeyPressK(Player player) public void KeyPressK(Player player)