From 4854d884b91b6838c0957f94f0495bb67126fb5d Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Sat, 22 Dec 2018 16:15:51 +0100
Subject: [PATCH] Fixed vehicle sync

---
 Client/vehiclesync/vehiclesync.js | 3 ++-
 Server/Managers/LoadManager.cs    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Client/vehiclesync/vehiclesync.js b/Client/vehiclesync/vehiclesync.js
index a9a27c69..65b99414 100644
--- a/Client/vehiclesync/vehiclesync.js
+++ b/Client/vehiclesync/vehiclesync.js
@@ -27,6 +27,7 @@ mp.events.add("VehStream_SetLockStatus", (veh, status) => {
 });
 
 mp.events.add("VehStream_PlayerEnterVehicleAttempt", (entity, seat) => {
+    entity = mp.vehicles.atRemoteId(entity);
     if (entity === undefined || entity === null || !entity.isAVehicle()) return;
     if (typeof entity.getVariable("VehicleSyncData") !== 'undefined') {
         var toggle = entity.getVariable("VehicleSyncData");
@@ -51,7 +52,7 @@ mp.events.add("VehStream_PlayerExitVehicleAttempt", (entity) => {
 
 mp.events.add("VehStream_PlayerExitVehicle", (entity) => {
     entity = mp.vehicles.atRemoteId(entity);
-    if (entity === undefined || entity === null/* || !entity.isAVehicle()*/) {
+    if (entity === undefined || entity === null || !entity.isAVehicle()) {
         return;
     }
     setTimeout(() => {
diff --git a/Server/Managers/LoadManager.cs b/Server/Managers/LoadManager.cs
index 002831d4..296554f7 100644
--- a/Server/Managers/LoadManager.cs
+++ b/Server/Managers/LoadManager.cs
@@ -5,6 +5,7 @@ using GTANetworkAPI;
 using reallife_gamemode.Model;
 using reallife_gamemode.Server.Entities;
 using reallife_gamemode.Server.Extensions;
+using reallife_gamemode.Server.Saves;
 
 /**
 * @overview Life of German Reallife - Managers LoadManager (LoadManager.cs)
@@ -22,7 +23,7 @@ namespace reallife_gamemode.Server.Managers
         {
             using (var loadData = new DatabaseContext())
             {
-                foreach (Saves.SavedBlip b in loadData.Blips)
+                foreach (SavedBlip b in loadData.Blips)
                 {
                     if(b.Active == true)
                     {