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

Fix SaniHeal / GZ-Edit

Browse Source
This commit is contained in:
VegaZ
2021-03-23 19:26:15 +01:00
parent 7629ef1e55
commit f9d0afd4d4
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -495,8 +495,8 @@ export default function factionInteraction(globalData: IGlobalData) {
timeLeft = 0; timeLeft = 0;
} else if (activeTask.Type == 1){ } else if (activeTask.Type == 1){
activeCheckpoint.destroy(); activeCheckpoint.destroy();
activeTask = null; mp.events.callRemote("delHealTaskAsMedic", activeTask.Victim);
mp.events.callRemote("delHealTask"); activeTask = null;
} }
}); });

10
ReallifeGamemode.Client/util/Gangwar.ts
View File

@@ -76,8 +76,8 @@ mp.keys.bind(0x65, false, function () {
//NUM0 //NUM0
mp.keys.bind(0x60, false, function () { mp.keys.bind(0x60, false, function () {
if (gzEdit && editorState == 1 && editPoint == null) { if (gzEdit && editorState == 1 && editPoint == null) {
editorState = 2; reloadGangZoneEditor();
squarItUp(); gzEdit = false;
} }
}); });
@@ -224,9 +224,9 @@ function renderVisualHelp() {
centre: false centre: false
}); });
} else if (editorState == 1) { } else if (editorState == 1) {
if (editPoint != null) { if (editPoint == null) {
mp.game.graphics.drawText("Welchen Eckpunkt möchtest du bearbeiten? Drücke ~g~NUM1-4\n"+ mp.game.graphics.drawText("Welchen Eckpunkt möchtest du bearbeiten? \nDrücke ~g~NUM1-4\n"+
"~s~Oder drücke ~g~NUM-0 ~s~ für die Finalisierung", [editVisualHelpX, editVisualHelpY], "~s~Oder drücke ~g~NUM-0 ~s~ zum Beenden", [editVisualHelpX, editVisualHelpY],
{ {
font: 0, font: 0,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],

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

@@ -125,11 +125,19 @@ namespace ReallifeGamemode.Server.Factions.Medic
[RemoteEvent("delHealTask")] [RemoteEvent("delHealTask")]
public static void delHealTask(Player player) public static void delHealTask(Player player)
{ {
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name || t.MedicName == player.Name); MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name);
RemoveTaskFromList(task); RemoveTaskFromList(task);
player.SetData("healauftrag", false); player.SetData("healauftrag", false);
} }
[RemoteEvent("delHealTaskAsMedic")]
public static void delHealTaskAsMedic(Player player, string victimName)
{
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == victimName);
RemoveTaskFromList(task);
player.SetData("healauftrag", false);
}
[RemoteEvent("delReviveTask")] [RemoteEvent("delReviveTask")]
public static void delReviveTask(Player player) public static void delReviveTask(Player player)
{ {