try fix jail death

This commit is contained in:
hydrant
2019-07-20 14:18:32 +02:00
parent 95e4241610
commit dbb6f49c8b
2 changed files with 14 additions and 22 deletions

View File

@@ -24,27 +24,6 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsLoggedIn()) player.Kick();
player.SetData("isDead", true);
if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
{
player.TriggerEvent("startDeathTimer", true);
}
else
{
player.TriggerEvent("startDeathTimer", false);
}
//var dutyMedics = 0;
//var allPlayers = NAPI.Pools.GetAllPlayers();
//foreach (Client medic in allPlayers)
//{
// if (medic.GetUser()?.FactionId == 2)
// {
// dutyMedics++;
// }
//}
//player.TriggerEvent("medicInfo", dutyMedics);
//TODO: Zum Full Release entfernen
ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString());
@@ -94,6 +73,15 @@ namespace ReallifeGamemode.Server.Events
};
Medic.AddTaskToList(reviveTask);
if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
{
player.TriggerEvent("startDeathTimer", true);
}
else
{
player.TriggerEvent("startDeathTimer", false);
}
//TODO PICTURE NOTIFICATION + SOUND für Medics
}
@@ -122,6 +110,8 @@ namespace ReallifeGamemode.Server.Events
Jail.Check_PutBehindBars(player);
}
[RemoteEvent("RespawnPlayerAtHospital")]
public void RespawnPlayerAtHospital(Client player)
{

View File

@@ -24,6 +24,8 @@ namespace ReallifeGamemode.Server.Wanted
client.SetData("isDead", false);
client.RemoveAllWeapons();
client.Health = 100;
client.Armor = 0;
Random rnd = new Random();
int rndInt = rnd.Next(1, 3);
if (rndInt == 1)