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

Sani Sicherheitscheck eingebaut

Browse Source
This commit is contained in:
VegaZ
2021-04-08 23:48:06 +02:00
parent f139dfdab7
commit 850d05b4f1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
import * as NativeUI from '../libs/NativeUI'; import * as NativeUI from '../libs/NativeUI';
import InputHelper from '../inputhelper'; import InputHelper from '../inputhelper';
import relativeVector from '../util/relativevector';
const Menu = NativeUI.Menu; const Menu = NativeUI.Menu;
const UIMenuItem = NativeUI.UIMenuItem; const UIMenuItem = NativeUI.UIMenuItem;
const UIMenuListItem = NativeUI.UIMenuListItem; const UIMenuListItem = NativeUI.UIMenuListItem;
@@ -429,7 +430,7 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.add('updateHealCheckpoint', (xPos, yPos, zPos) => { mp.events.add('updateHealCheckpoint', (xPos, yPos, zPos) => {
if (activeTask && activeTask.Type == 1) { 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); mp.game.ui.setNewWaypoint(xPos, yPos);
} }
}); });

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

@@ -239,11 +239,14 @@ namespace ReallifeGamemode.Server.Factions.Medic
{ {
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name); MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name);
if (task != null) if (task != null)
{ {
RemoveTaskFromList(task);
player.SetData("healauftrag", false); player.SetData("healauftrag", false);
var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName); 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) if (task != null)
{ {
var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName); var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint"); if (task.MedicName != "none")
{
medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
}
RemoveTaskFromList(task); RemoveTaskFromList(task);
} }
} }