Add revive-Sperre

This commit is contained in:
VegaZ
2021-04-05 17:55:23 +02:00
parent e02a6b6af7
commit 8a0820541e
2 changed files with 26 additions and 17 deletions

View File

@@ -309,6 +309,12 @@ namespace ReallifeGamemode.Server.Commands
ChatService.ErrorMessage(player, "Es wurde kein toter Spieler gefunden"); ChatService.ErrorMessage(player, "Es wurde kein toter Spieler gefunden");
return; return;
} }
if (deadPlayer.HasData("reviveSperre"))
{
ChatService.ErrorMessage(player, "Der Spieler hat eine Revivesperre");
return;
}
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
var deadPlayerUser = deadPlayer.GetUser(dbContext); var deadPlayerUser = deadPlayer.GetUser(dbContext);

View File

@@ -32,6 +32,7 @@ namespace ReallifeGamemode.Server.Events
player.Kick(); player.Kick();
return; return;
} }
player.SetData("isDead", true); player.SetData("isDead", true);
@@ -42,9 +43,6 @@ namespace ReallifeGamemode.Server.Events
userDeath.SaveChanges(); userDeath.SaveChanges();
} }
//TODO: Zum Full Release entfernen //TODO: Zum Full Release entfernen
if (player.HasData("togdeath")) { if (player.HasData("togdeath")) {
ChatService.SendMessage(player, "Du bist durch " + (killer?.Name ?? "Niemanden") + " gestorben: " + reason.ToString()); ChatService.SendMessage(player, "Du bist durch " + (killer?.Name ?? "Niemanden") + " gestorben: " + reason.ToString());
@@ -92,21 +90,26 @@ namespace ReallifeGamemode.Server.Events
if (user.JailTime <= 0) if (user.JailTime <= 0)
{ {
//MEDIC AUFTRAG if (!player.HasData("reviveSperre"))
MedicTask reviveTask = new MedicTask()
{ {
Victim = player.Name, //MEDIC AUFTRAG
Position = player.Position, MedicTask reviveTask = new MedicTask()
CauseOfDeath = reason.ToString(), {
Caller = null, Victim = player.Name,
Description = "Gestorben", Position = player.Position,
Time = DateTime.Now, CauseOfDeath = reason.ToString(),
Type = MedicTaskType.REVIVE, Caller = null,
MedicName = "none" Description = "Gestorben",
}; Time = DateTime.Now,
Medic.AddTaskToList(reviveTask); Type = MedicTaskType.REVIVE,
Medic.delHealTask(player); MedicName = "none"
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List<int>() { 2 }); };
Medic.AddTaskToList(reviveTask);
Medic.delHealTask(player);
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List<int>() { 2 });
}
if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true) if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
{ {