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

Nochmal...

Browse Source
This commit is contained in:
VegaZ
2021-02-08 19:58:49 +01:00
parent 1f63ba5470
commit f26824aaee
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,7 +481,7 @@ export default function factionInteraction(globalData: IGlobalData) {
if (deadRespawned == true) { if (deadRespawned == true) {
activeTask = false; activeTask = false;
activeCheckpoint.destroy(); activeCheckpoint.destroy();
mp.events.callRemote("delReviveTask"); mp.events.callRemote("delReviveTaskMedic");
mp.events.callRemote("PayCutMedicEarnings"); mp.events.callRemote("PayCutMedicEarnings");
mp.gui.chat.push("DEBUG: Hälfte ausgezahlt") mp.gui.chat.push("DEBUG: Hälfte ausgezahlt")
deadRespawned = false; deadRespawned = false;

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

@@ -232,7 +232,7 @@ namespace ReallifeGamemode.Server.Events
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
player.RemoveAllWeapons(); player.RemoveAllWeapons();
Medic.delReviveTask(player); //Medic.delReviveTask(player);
NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5), -98.36f); NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5), -98.36f);
} }
} }

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

@@ -129,6 +129,12 @@ namespace ReallifeGamemode.Server.Factions.Medic
MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name); MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
RemoveTaskFromList(task); RemoveTaskFromList(task);
} }
[RemoteEvent("delReviveTaskMedic")]
public static void delReviveTaskMedic(Player player)
{
MedicTask task = ReviveTasks.FirstOrDefault(t => t.MedicName == player.Name);
RemoveTaskFromList(task);
}
[RemoteEvent("RemoveMedicCheckpoint")] [RemoteEvent("RemoveMedicCheckpoint")]
public void RemoveMedicCheckpoint(Player player) public void RemoveMedicCheckpoint(Player player)