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-10 01:33:34 +02:00
parent b51756a045 aa57c7d0fa
commit e3e6b3ff10
10 changed files with 115 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Events
user.Dead = true;
if (!player.HasData("reviveSperre"))
if (!player.HasData("reviveSperre") || !player.HasData("inGangWar") || player.GetData<bool>("SAdminduty") == true)
{
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()

2
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -152,7 +152,7 @@ namespace ReallifeGamemode.Server.Events
if (player.GetData<bool>("duty") == true)
{
player.SetData<bool>("duty", false);
Medic.UpdateDutyMedics(-1);
Medic.UpdateDutyMedics();
}
}
}

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

@@ -298,7 +298,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("toggleDutyMode", true);
if (player.GetUser().FactionId == 2) //Fire Department
{
Medic.UpdateDutyMedics(1);
Medic.UpdateDutyMedics();
}
switch (factionId)
{
@@ -336,7 +336,7 @@ namespace ReallifeGamemode.Server.Events
user.SetData("duty", false);
player.SendNotification("Du bist nun ~r~außer Dienst.");
player.TriggerEvent("toggleDutyMode", false);
Medic.UpdateDutyMedics(-1);
Medic.UpdateDutyMedics();
UpdateCharacterCloth.LoadCharacterDefaults(player);
}
user.SetBlipAndNametagColor();