diff --git a/ReallifeGamemode.Client/FactionManagement/main.ts b/ReallifeGamemode.Client/FactionManagement/main.ts index fc53aee7..6fb3ebbb 100644 --- a/ReallifeGamemode.Client/FactionManagement/main.ts +++ b/ReallifeGamemode.Client/FactionManagement/main.ts @@ -4,7 +4,7 @@ * @copyright (c) 2008 - 2018 Life of German */ -export default function factionManagement() { +export default function factionManagement(globalData: IGlobalData) { var manageFactionRanksBrowser = null; var rankData = null; @@ -21,7 +21,7 @@ export default function factionManagement() { manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`); manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`); mp.gui.cursor.show(true, true); - this.data.InMenu = true; + globalData.InMenu = true; } }); @@ -30,7 +30,7 @@ export default function factionManagement() { manageFactionRanksBrowser.destroy(); mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); - this.data.InMenu = false; + globalData.InMenu = false; var obj: FactionRanks = { factionId: rankData.FactionId, diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index b9430a61..763acf17 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -84,7 +84,7 @@ import doorManager from './DoorManager/doormanager'; doorManager(); import factionManagement from './FactionManagement/main'; -factionManagement(); +factionManagement(globalData); import deathScreen from './Gui/deathscreen'; deathScreen(); diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index d1b61dda..89d74d6f 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using System.Linq; using ReallifeGamemode.Server.Extensions; @@ -47,20 +47,20 @@ namespace ReallifeGamemode.Server.Inventory.Items if(veh.Controller == null) { - player.SendNotification("Es sitzt jemand im Auto du kannst es nicht Reparieren!"); + player.SendNotification("Du kannst dieses Fahrzeug nicht reparieren, weil Jemand bereits im Fahrzeug sitzt"); return false; } if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) { - player.SendNotification("Du kannst den Waffentransporter nicht Reparieren!"); + player.SendNotification("Du kannst den Waffentransporter nicht reparieren!"); return false; } using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); + player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet", false); InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); serverVehicle.Spawn(veh).Position = position;