diff --git a/ReallifeGamemode.Client/Gui/ahelp.ts b/ReallifeGamemode.Client/Gui/ahelp.ts index 81d6720f..22025441 100644 --- a/ReallifeGamemode.Client/Gui/ahelp.ts +++ b/ReallifeGamemode.Client/Gui/ahelp.ts @@ -22,7 +22,6 @@ export default function ahelp(globalData: IGlobalData): void { ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/ahelp.html'); mp.gui.chat.activate(false); mp.gui.cursor.show(true, true); - } }); @@ -37,7 +36,6 @@ export default function ahelp(globalData: IGlobalData): void { globalData.InInput = false; mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); - } }); diff --git a/ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf b/ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf new file mode 100644 index 00000000..ea2643a3 --- /dev/null +++ b/ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f1478ada7534b954caaec991bb2a3a24767b978de82533965e0c21c3d02831f +size 8491 diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 1ee4852f..6dfdafee 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -233,12 +233,14 @@ import bankMenuHandle from './Interaction/bankmenu'; import InputHelper from './inputhelper'; bankMenuHandle(globalData); -import Introduction from './Gui/introduction'; -Introduction(globalData); import ahelp from './Gui/ahelp'; ahelp(globalData); +import Introduction from './Gui/introduction'; +Introduction(globalData); + + import userhelp from './Gui/userhelp'; userhelp(globalData); diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 5e9fdb60..38e6b022 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -222,7 +222,7 @@ namespace ReallifeGamemode.Server.Commands #region Support - [Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~ip~s~, ~g~deathlogs~s~, ~g~lc~s~", GreedyArg = true)] + [Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~IP~s~, ~g~deathlogs~s~, ~g~LC~s~]", GreedyArg = true)] public void CmdTog(Player player, string typ, string option1 = null, string option2 = null) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index a3c4a794..d88b8ce9 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -190,7 +190,7 @@ namespace ReallifeGamemode.Server.DrivingSchool veh.Position = sVeh.Position; veh.Rotation = new Vector3(0, 0, sVeh.Heading); - user.Position = new Vector3(-813.17, -1354.5, 4.14); + user.Position = new Vector3(-814.39, -1336.76, 5.15); } [RemoteEvent("drivingSchoolEvent")] @@ -304,7 +304,7 @@ namespace ReallifeGamemode.Server.DrivingSchool veh.Position = sVeh.Position; veh.Rotation = new Vector3(0, 0, sVeh.Heading); - user.Position = new Vector3(-813.17, -1354.5, 4.14); + user.Position = new Vector3(-814.39, -1336.76, 5.15); } [RemoteEvent("bikeSchoolEvent")]