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

This commit is contained in:
VegaZ
2018-12-10 22:23:12 +01:00

View File

@@ -2,6 +2,7 @@
//You don't need to worry about anything here
mp.events.add("VehStream_SetEngineStatus", (veh, status) => {
if (veh === undefined || veh === null) return;
if (veh !== undefined) {
if (veh.isSeatFree(-1)) //Turns engine on instantly if no driver, otherwise it will not turn on
{
@@ -16,6 +17,7 @@ mp.events.add("VehStream_SetEngineStatus", (veh, status) => {
});
mp.events.add("VehStream_SetLockStatus", (veh, status) => {
if (veh === undefined || veh === null) return;
if (veh !== undefined) {
if (status)
veh.setDoorsLocked(2);
@@ -25,6 +27,7 @@ mp.events.add("VehStream_SetLockStatus", (veh, status) => {
});
mp.events.add("VehStream_PlayerEnterVehicleAttempt", (entity, seat) => {
if (entity === undefined || entity === null) return;
if (typeof entity.getVariable("VehicleSyncData") !== 'undefined') {
var toggle = entity.getVariable("VehicleSyncData");
entity.setEngineOn(toggle.Engine, false, true);
@@ -33,6 +36,7 @@ mp.events.add("VehStream_PlayerEnterVehicleAttempt", (entity, seat) => {
});
mp.events.add("VehStream_PlayerExitVehicleAttempt", (entity) => {
if (entity === undefined || entity === null) return;
if (entity !== undefined) {
if (typeof entity.getVariable("VehicleSyncData") !== 'undefined') {
var toggle = entity.getVariable("VehicleSyncData");
@@ -46,7 +50,7 @@ mp.events.add("VehStream_PlayerExitVehicleAttempt", (entity) => {
});
mp.events.add("VehStream_PlayerExitVehicle", (entity) => {
if (entity === undefinex) return;
if (entity === undefined || entity === null) return;
setTimeout(() => {
var Status = [];
let y = 0;
@@ -216,6 +220,7 @@ mp.events.add("VehStream_PlayerExitVehicle", (entity) => {
});
mp.events.add("VehStream_PlayerEnterVehicleAttempt", (entity, seat) => {
if (entity === undefined || entity === null) return;
setTimeout(() => {
var Status = [];
let y = 0;
@@ -282,12 +287,14 @@ mp.events.add("VehStream_PlayerEnterVehicleAttempt", (entity, seat) => {
});
mp.events.add("VehStream_SetVehicleDirtLevel", (entity, dirt) => {
if (entity === undefined || entity === null) return;
if (entity !== undefined) {
entity.setDirtLevel(dirt);
}
});
mp.events.add("VehStream_SetVehicleDoorStatus_Single", (veh, door, state) => {
if (veh === undefined || veh === null) return;
if (veh !== undefined) {
if (state === 0) {
veh.setDoorShut(door, false);
@@ -302,7 +309,7 @@ mp.events.add("VehStream_SetVehicleDoorStatus_Single", (veh, door, state) => {
});
mp.events.add("VehStream_SetVehicleDoorStatus", (...args) => {
if (args[0] !== undefined) {
if (args[0] !== undefined && args[0] !== null) {
let y = 0;
for (y = 1; y < args.length; y++) {
if (args[y] === 0) {
@@ -319,6 +326,7 @@ mp.events.add("VehStream_SetVehicleDoorStatus", (...args) => {
});
mp.events.add("VehStream_SetVehicleWindowStatus_Single", (veh, windw, state) => {
if (veh === undefined || veh === null) return;
if (veh !== undefined) {
if (state === 1) {
veh.rollDownWindow(windw);
@@ -352,6 +360,7 @@ mp.events.add("VehStream_SetVehicleWindowStatus", (...args) => {
});
mp.events.add("VehStream_SetVehicleWheelStatus_Single", (veh, wheel, state) => {
if (veh === undefined || veh === null) return;
if (veh !== undefined) {
if (wheel === 9) {
if (state === 1) {
@@ -390,7 +399,7 @@ mp.events.add("VehStream_SetVehicleWheelStatus_Single", (veh, wheel, state) => {
});
mp.events.add("VehStream_SetVehicleWheelStatus", (...args) => {
if (args[0] !== undefined) {
if (args[0] !== undefined && args[0] !== null) {
let y = 0;
for (y = 1; y < args.length; y++) {
if (y === 9) {