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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
hydrant
2021-04-02 21:51:34 +02:00
parent 8cbab7ef15 5364ddff59
commit 7687d3bc58
13 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,13 +546,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return;
}
}else
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
}
if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
} else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
{
if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
{
@@ -569,13 +563,13 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return;
}
}else
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
}
if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
}
else
{
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return;
}
if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
{
if (job.GetUsersInJob().Contains(player))
{
@@ -590,13 +584,14 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return;
}
}
}
else
{
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return;
}
}else
}
else
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
@@ -616,14 +611,15 @@ namespace ReallifeGamemode.Server.Events
public void KeyPressO(Player player)
{
if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers();
List<Player> players = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() == true).ToList();
var listPlayers = players.Select(p => new
{
Id = p.Handle.Value,
p.Name,
p.Ping,
FactionName = p.GetUser().Faction?.Name ?? "Zivilist",
}) ;
});
player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers));
}

1
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -63,6 +63,7 @@ namespace ReallifeGamemode.Server.Events
player.SetData("duty", false);
player.SetData("Adminduty", false);
player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0);
player.TriggerEvent("headshotoff");
Gangwar.Gangwar.loadPlayer(player);
if (user.FactionLeader)
{