From 56ab0734ee71fb7d9b56e278caa0e0adf9b6a89f Mon Sep 17 00:00:00 2001 From: kookroach Date: Wed, 7 Apr 2021 22:42:57 +0200 Subject: [PATCH] fix postitioning of cuffs and delete cuffpoits on death --- .../util/attachmentMngr.ts | 2 +- ReallifeGamemode.Server/Events/Death.cs | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ReallifeGamemode.Client/util/attachmentMngr.ts b/ReallifeGamemode.Client/util/attachmentMngr.ts index a19df0ba..bb62ee5d 100644 --- a/ReallifeGamemode.Client/util/attachmentMngr.ts +++ b/ReallifeGamemode.Client/util/attachmentMngr.ts @@ -8,7 +8,7 @@ export default function attachmentManager(game: IGame) { attachmentMngr.register("weapondeal", "ex_prop_crate_ammo_bc", "chassis_dummy", new mp.Vector3(0.08, -0.9, -0.2), new mp.Vector3(0, 0, 0)); attachmentMngr.register("weapondeal1", "ex_office_swag_guns02", "chassis_dummy", new mp.Vector3(0, 0.8, 0), new mp.Vector3(0, 0, 0)); attachmentMngr.register("weapondeal2", "w_sg_pumpshotgun", "chassis_dummy", new mp.Vector3(0.4, 1.6, 0.62), new mp.Vector3(90, 0, 180)); - attachmentMngr.register("handcuffs", "p_cs_cuffs_02_s", 28422, new mp.Vector3(0, 0, 0), new mp.Vector3(0, 90, 0)); + attachmentMngr.register("handcuffs", "p_cs_cuffs_02_s", 28422, new mp.Vector3(-0.05, 0, 0), new mp.Vector3(90, 90, 0)); }); const attachmentMngr = diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index b4edee69..fe1db994 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -25,27 +25,29 @@ namespace ReallifeGamemode.Server.Events public class Death : Script { [ServerEvent(Event.PlayerDeath)] - public void OnPlayerDeath(Player player, Player killer, uint reason ) + public void OnPlayerDeath(Player player, Player killer, uint reason) { if (!player.IsLoggedIn()) { player.Kick(); return; } - + + PositionManager.cuffPoints.Remove(player); + player.SetData("isDead", true); - using (var userDeath = new DatabaseContext()) - { + { User userisdead = player.GetUser(userDeath); userisdead.Dead = true; - userDeath.SaveChanges(); - } + userDeath.SaveChanges(); + } //TODO: Zum Full Release entfernen - if (player.HasData("togdeath")) { - ChatService.SendMessage(player, "Du bist durch " + (killer?.Name ?? "Niemanden") + " gestorben: " + reason.ToString()); + if (player.HasData("togdeath")) + { + ChatService.SendMessage(player, "Du bist durch " + (killer?.Name ?? "Niemanden") + " gestorben: " + reason.ToString()); } int? killerId; float killerPosX; @@ -108,8 +110,6 @@ namespace ReallifeGamemode.Server.Events Medic.delHealTask(player); ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List() { 2 }); } - - if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true) {