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:
Lukas Moungos
2021-04-06 23:35:17 +02:00
parent fcccaa8c51 69cdee7198
commit ca32be4d0d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,7 @@ namespace ReallifeGamemode.Server.Events
using var dbContext = new DatabaseContext(); using var dbContext = new DatabaseContext();
User u = player.GetUser(dbContext); User u = player.GetUser(dbContext);
if (u == null) return; if (u == null) return;
if (player.GetData<bool>("isDead")) return;
var vehicles = dbContext.UserVehicles.Where(veh => veh.UserId == u.Id).OrderBy(veh => veh.Id).Select(v => new var vehicles = dbContext.UserVehicles.Where(veh => veh.UserId == u.Id).OrderBy(veh => veh.Id).Select(v => new
{ {
@@ -607,6 +608,8 @@ namespace ReallifeGamemode.Server.Events
public void KeyPressI(Player player) public void KeyPressI(Player player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
if (player.GetData<bool>("isDead")) return;
player.TriggerEvent("inventoryShow"); player.TriggerEvent("inventoryShow");
InventoryManager.SetBackpackItems(player); InventoryManager.SetBackpackItems(player);
} }
@@ -681,6 +684,7 @@ namespace ReallifeGamemode.Server.Events
public void KeyPressO(Player player) public void KeyPressO(Player player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() == true).OrderBy(o => o.Handle.Value).ToList(); List<Player> players = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() == true).OrderBy(o => o.Handle.Value).ToList();
var listPlayers = players.Select(p => new var listPlayers = players.Select(p => new

6
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -809,6 +809,12 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")] [RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")]
public void CallServiceSani(Player player) public void CallServiceSani(Player player)
{ {
if (player.GetUser().FactionId == 2)
{
player.SendNotification("~r~[Fehler] ~w~Du kannst keinen Sanitäter rufen.");
return;
}
//MEDIC AUFTRAG //MEDIC AUFTRAG
MedicTask healTask = new MedicTask() MedicTask healTask = new MedicTask()
{ {