aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
michael.reiswich
2021-05-24 13:08:33 +02:00
parent 294b0f5aa8 d295726df6
commit 1621576758
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/FactionManagement/main.ts
View File

@@ -4,7 +4,7 @@
* @copyright (c) 2008 - 2018 Life of German * @copyright (c) 2008 - 2018 Life of German
*/ */
export default function factionManagement() { export default function factionManagement(globalData: IGlobalData) {
var manageFactionRanksBrowser = null; var manageFactionRanksBrowser = null;
var rankData = null; var rankData = null;
@@ -21,7 +21,7 @@ export default function factionManagement() {
manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`); manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`);
manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`); manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
this.data.InMenu = true; globalData.InMenu = true;
} }
}); });
@@ -30,7 +30,7 @@ export default function factionManagement() {
manageFactionRanksBrowser.destroy(); manageFactionRanksBrowser.destroy();
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
this.data.InMenu = false; globalData.InMenu = false;
var obj: FactionRanks = { var obj: FactionRanks = {
factionId: rankData.FactionId, factionId: rankData.FactionId,

2
ReallifeGamemode.Client/index.ts
View File

@@ -84,7 +84,7 @@ import doorManager from './DoorManager/doormanager';
doorManager(); doorManager();
import factionManagement from './FactionManagement/main'; import factionManagement from './FactionManagement/main';
factionManagement(); factionManagement(globalData);
import deathScreen from './Gui/deathscreen'; import deathScreen from './Gui/deathscreen';
deathScreen(); deathScreen();

8
ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs
View File

@@ -1,4 +1,4 @@
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using System.Linq; using System.Linq;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;
@@ -47,20 +47,20 @@ namespace ReallifeGamemode.Server.Inventory.Items
if(veh.Controller == null) 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; return false;
} }
if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) 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; return false;
} }
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
Vector3 position = veh.Position; 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); InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext);
serverVehicle.Spawn(veh).Position = position; serverVehicle.Spawn(veh).Position = position;