From 850d05b4f1bd5fca23d56daad309e7755bd09476 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Thu, 8 Apr 2021 23:48:06 +0200 Subject: [PATCH] Sani Sicherheitscheck eingebaut --- .../Interaction/factioninteraction.ts | 3 ++- ReallifeGamemode.Server/Factions/Medic/Medic.cs | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index 54642ae2..f691f9fa 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -1,5 +1,6 @@ import * as NativeUI from '../libs/NativeUI'; import InputHelper from '../inputhelper'; +import relativeVector from '../util/relativevector'; const Menu = NativeUI.Menu; const UIMenuItem = NativeUI.UIMenuItem; const UIMenuListItem = NativeUI.UIMenuListItem; @@ -429,7 +430,7 @@ export default function factionInteraction(globalData: IGlobalData) { mp.events.add('updateHealCheckpoint', (xPos, yPos, zPos) => { if (activeTask && activeTask.Type == 1) { - activeCheckpoint.setCoords(xPos, yPos, zPos, false, false, false, false); + activeCheckpoint.setCoords2(xPos, yPos, zPos, 0, 0, 0, false); mp.game.ui.setNewWaypoint(xPos, yPos); } }); diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 4b5e634f..89c8fbe7 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -239,11 +239,14 @@ namespace ReallifeGamemode.Server.Factions.Medic { MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name); if (task != null) - { - RemoveTaskFromList(task); + { player.SetData("healauftrag", false); var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName); - medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint"); + if (task.MedicName != "none") + { + medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint"); + } + RemoveTaskFromList(task); } } @@ -263,7 +266,10 @@ namespace ReallifeGamemode.Server.Factions.Medic if (task != null) { var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName); - medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint"); + if (task.MedicName != "none") + { + medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint"); + } RemoveTaskFromList(task); } }