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

Fix Multi Death

Browse Source
This commit is contained in:
VegaZ
2021-04-11 04:11:26 +02:00
parent a0bc6bbd90
commit ffb6a39003
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,11 +93,9 @@ namespace ReallifeGamemode.Server.Events
if (user.JailTime <= 0) if (user.JailTime <= 0)
{ {
player.SetData("isDead", true);
user.Dead = true; user.Dead = true;
if (!player.HasData("reviveSperre") && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false) if (!player.HasData("reviveSperre") && player.GetData<bool>("isDead") == false && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false)
{ {
//MEDIC AUFTRAG //MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask() MedicTask reviveTask = new MedicTask()
@@ -116,6 +114,8 @@ namespace ReallifeGamemode.Server.Events
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List<int>() { 2 }); ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List<int>() { 2 });
} }
player.SetData("isDead", true);
if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true) if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
{ {
player.TriggerEvent("startDeathTimer", true); player.TriggerEvent("startDeathTimer", true);

5
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -274,10 +274,9 @@ namespace ReallifeGamemode.Server.Factions.Medic
} }
[RemoteEvent("delReviveTask")] public static void delReviveTask(Player target)
public static void delReviveTask(Player player)
{ {
MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name); MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == target.Name);
if (task != null) if (task != null)
{ {
var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName); var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);