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

Fix Medic System 3

Browse Source
This commit is contained in:
VegaZ
2021-04-08 22:51:11 +02:00
parent eea9f9dc38
commit 654c17e20c
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -235,6 +235,7 @@ export default function factionInteraction(globalData: IGlobalData) {
if (activeTask != null) { if (activeTask != null) {
if (activeTask.Type == 1 && activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) { if (activeTask.Type == 1 && activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
deleteCheckpointItem = new UIMenuItem("~r~Checkpoint löschen"); deleteCheckpointItem = new UIMenuItem("~r~Checkpoint löschen");
factionInteractionMenu.AddItem(deleteCheckpointItem);
} }
} }
} }
@@ -270,6 +271,7 @@ export default function factionInteraction(globalData: IGlobalData) {
factionInteractionMenu.Close(); factionInteractionMenu.Close();
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
mp.events.call("destroyMedicTaskCheckpoint");
break; break;
} }

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

@@ -147,10 +147,6 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("CLIENT:DestroyPed", 3); player.TriggerEvent("CLIENT:DestroyPed", 3);
player.TriggerEvent("CLIENT:DestroyPed", 4); player.TriggerEvent("CLIENT:DestroyPed", 4);
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
Medic.delHealTask(player); Medic.delHealTask(player);
Medic.delReviveTask(player); Medic.delReviveTask(player);
if (player.GetData<bool>("duty") == true) if (player.GetData<bool>("duty") == true)

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

@@ -221,8 +221,13 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static void delHealTask(Player player) public static void delHealTask(Player player)
{ {
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name); MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name);
if(task != null) RemoveTaskFromList(task); if (task != null)
player.SetData("healauftrag", false); {
RemoveTaskFromList(task);
player.SetData("healauftrag", false);
var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
}
} }
[RemoteEvent("delHealTaskAsMedic")] [RemoteEvent("delHealTaskAsMedic")]
@@ -231,13 +236,19 @@ namespace ReallifeGamemode.Server.Factions.Medic
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == victimName); MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == victimName);
RemoveTaskFromList(task); RemoveTaskFromList(task);
player.SetData("healauftrag", false); player.SetData("healauftrag", false);
} }
[RemoteEvent("delReviveTask")] [RemoteEvent("delReviveTask")]
public static void delReviveTask(Player player) public static void delReviveTask(Player player)
{ {
MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name); MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
RemoveTaskFromList(task); if (task != null)
{
var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
RemoveTaskFromList(task);
}
} }
public static void UpdateDutyMedics(int modifier) public static void UpdateDutyMedics(int modifier)