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

Rework deathdate in ReviveTasks

Browse Source
This commit is contained in:
VegaZ
2021-02-13 17:26:09 +01:00
parent 02f0943e11
commit 81fc9f6c6e
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -161,6 +161,25 @@ namespace ReallifeGamemode.Server.Commands
#region Mapping / Entwicklung
[Command("fakedeath", "~m~Benutzung: ~s~/fakedeath")] //Für Testing
public void CmdFakeDeath(Player player)
{
MedicTask reviveTask = new MedicTask()
{
Victim = "Test",
Position = new Vector3(1157.56f, -1510.56f, 34.8434f),
CauseOfDeath = "FAKE",
Caller = null,
Description = "Gestorben",
Time = DateTime.Now,
Type = MedicTaskType.REVIVE,
MedicName = "none",
};
Int32[] deathTimes = new Int32[] { 1613155414, 1613155340, 1613155222 };
player.SendChatMessage("SERVER: " + reviveTask.Time.ToString());
player.TriggerEvent("serializeString", JsonConvert.SerializeObject(reviveTask), JsonConvert.SerializeObject(deathTimes));
}
[Command("team", "~m~Benutzung: ~s~/team")]
public void CmdAdminTeam(Player player)
{

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

@@ -7,6 +7,7 @@ using ReallifeGamemode.Services;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using Microsoft.EntityFrameworkCore;
using System;
/**
* @overview Life of German Reallife - Server Factions Medic Medic.cs
@@ -76,15 +77,21 @@ namespace ReallifeGamemode.Server.Factions.Medic
switch (type)
{
case 0:
player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks));
List<long> deathTimes = new List<long>();
foreach(var task in ReviveTasks)
{
deathTimes.Add(((DateTimeOffset)task.Time).ToUnixTimeSeconds());
}
player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks), JsonConvert.SerializeObject(deathTimes));
break;
case 1:
player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks));
player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks), null);
break;
case 2:
player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks));
player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks), null);
break;
}
}