[HOTFIX] fix some nullreferences

2021-04-11 22:35:03 +02:00
parent ae90c82855
commit 231edc71d9
3 changed files with 30 additions and 22 deletions
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -238,8 +238,12 @@ namespace ReallifeGamemode.Server.Events
      }
      player.RemoveAllWeapons();
      MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
-      Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
-      Medic.RemoveTaskFromList(task);
+
+      if(task != null)
+      {
+        Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
+        Medic.RemoveTaskFromList(task);
+      }

      player.SafeTeleport(new Vector3(-495.45, -336.33, 34.5), 0, true);
    }