From 488f42a3657a001101bfbdd0e32ce048611d4874 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 1 Nov 2018 15:19:09 +0100 Subject: [PATCH] Fixed doormanager --- Client/DoorManager/doormanager.js | 2 ++ Server/Managers/DoorManager.cs | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Client/DoorManager/doormanager.js b/Client/DoorManager/doormanager.js index 7f37f7ce..b411b8ca 100644 --- a/Client/DoorManager/doormanager.js +++ b/Client/DoorManager/doormanager.js @@ -1,3 +1,5 @@ mp.events.add('changeDoorState', (doorHash, x, y, z, locked, p5, p6, p7) => { + locked === 1 ? locked = true : locked = false; + mp.game.object.doorControl(doorHash, x, y, z, locked, p5, p6, p7); }); \ No newline at end of file diff --git a/Server/Managers/DoorManager.cs b/Server/Managers/DoorManager.cs index 50548df1..0e4a23e6 100644 --- a/Server/Managers/DoorManager.cs +++ b/Server/Managers/DoorManager.cs @@ -22,15 +22,15 @@ namespace reallife_gamemode.Server.Managers if (NAPI.Data.GetWorldData("policeDoors") == false) { player.SendNotification("Polizeitüren ~r~abgeschlossen", false); - NAPI.ClientEvent.TriggerClientEventForAll("changeDoorState", 320433149, 434.7479f, -983.2151f, 30.83926f, 1, 0.0f, 0.0f, 0.0f); - NAPI.ClientEvent.TriggerClientEventForAll("changeDoorState", -1215222675, 434.7479f, -980.6184f, 30.83926f, 1, 0.0f, 0.0f, 0.0f); + NAPI.Pools.GetAllPlayers().ForEach(p => p.TriggerEvent("changeDoorState", 320433149, 434.7479f, -983.2151f, 30.83926f, 1, 0.0f, 0.0f, 0.0f)); + NAPI.Pools.GetAllPlayers().ForEach(p => p.TriggerEvent("changeDoorState", -1215222675, 434.7479f, -980.6184f, 30.83926f, 1, 0.0f, 0.0f, 0.0f)); NAPI.Data.SetWorldData("policeDoors", true); } else { player.SendNotification("Polizeitüren ~g~aufgeschlossen", false); - NAPI.ClientEvent.TriggerClientEventForAll("changeDoorState", 320433149, 434.7479f, -983.2151f, 30.83926f, 0, 0.0f, 0.0f, 0.0f); - NAPI.ClientEvent.TriggerClientEventForAll("changeDoorState", -1215222675, 434.7479f, -980.6184f, 30.83926f, 0, 0.0f, 0.0f, 0.0f); + NAPI.Pools.GetAllPlayers().ForEach(p => p.TriggerEvent("changeDoorState", 320433149, 434.7479f, -983.2151f, 30.83926f, 0, 0.0f, 0.0f, 0.0f)); + NAPI.Pools.GetAllPlayers().ForEach(p => p.TriggerEvent("changeDoorState", -1215222675, 434.7479f, -980.6184f, 30.83926f, 0, 0.0f, 0.0f, 0.0f)); NAPI.Data.SetWorldData("policeDoors", false); } }