From 7c99a1981a0c4e61518be86a5cb63d8f07455976 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 26 Dec 2018 16:19:38 +0100 Subject: [PATCH] Added /reloaddoors Command --- Client/DoorManager/doormanager.js | 2 +- Server/Commands/Admin.cs | 13 +++++++++++++ Server/Managers/DoorManager.cs | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Client/DoorManager/doormanager.js b/Client/DoorManager/doormanager.js index b411b8ca..9123a22d 100644 --- a/Client/DoorManager/doormanager.js +++ b/Client/DoorManager/doormanager.js @@ -2,4 +2,4 @@ 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/Commands/Admin.cs b/Server/Commands/Admin.cs index 37974de3..5adc264b 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -2211,6 +2211,19 @@ namespace reallife_gamemode.Server.Commands } } + [Command("reloaddoors", "~m~Benutzung: ~s~/reloaddoors")] + public void CmdAdminReloaddoors(Client player) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + DoorManager.ReloadDoors(); + player.SendChatMessage("~b~[ADMIN]~s~ Die Türen wurden erfolgreich neugeladen."); + } + #endregion #region ALevel1338 diff --git a/Server/Managers/DoorManager.cs b/Server/Managers/DoorManager.cs index 1b51b611..db147c91 100644 --- a/Server/Managers/DoorManager.cs +++ b/Server/Managers/DoorManager.cs @@ -32,6 +32,10 @@ namespace reallife_gamemode.Server.Managers public static void ReloadDoors() { + foreach(var doorPair in _doorColShapes) + { + doorPair.Value.Entity().Delete(); + } _doorColShapes.Clear(); LoadDoors(); } @@ -70,7 +74,6 @@ namespace reallife_gamemode.Server.Managers if(_doorColShapes.ContainsValue(colShape.Handle)) { int doorId = _doorColShapes.Where(d => d.Value.Value == colShape.Handle.Value).FirstOrDefault().Key; - NAPI.Util.ConsoleOutput("entered door colshape id = " + doorId); using(var dbContext = new DatabaseContext()) {