Merge pull request #594 from Stephan-S/dev_axel32019

Release 2.0.0.7

README.md

@@ -1,10 +1,10 @@
 # FS22_AutoDrive
 FS22 version of the AutoDrive mod
 
-### Latest Release: 2.0.0.6
+### Latest Release: 2.0.0.7
 ![GitHub all releases](https://img.shields.io/github/downloads/Stephan-S/FS22_AutoDrive/total?label=Downloads&style=plastic)  
 [Latest Release](https://github.com/Stephan-S/FS22_AutoDrive/releases/latest)  
-Direct Download: https://github.com/Stephan-S/FS22_AutoDrive/releases/download/2.0.0.6/FS22_AutoDrive.zip
+Direct Download: https://github.com/Stephan-S/FS22_AutoDrive/releases/download/2.0.0.7/FS22_AutoDrive.zip
 
 ## Discord Server:
 For help & support, feel free to join us on Discord: 

modDesc.xml

@@ -32,7 +32,7 @@ Différents modes d'utilisation ont été ajoutés depuis les premières version
 			<![CDATA[Этот мод может быть использован для создания сети маршрутов для транспортных средств для автономного вождения. После настройки вы можете указать трактору, стоящему где-угодно рядом с сетью, проехать в любую точку, например, в магазин, поле №1 или в точку продажи.]]>
 		</ru>
 	</description>
-	<version>2.0.0.6</version>
+	<version>2.0.0.7</version>
 	<multiplayer supported="true" />
 	<iconFilename>icon.dds</iconFilename>
 	<extraSourceFiles>

scripts/AutoDrive.lua

@@ -1,5 +1,5 @@
 AutoDrive = {}
-AutoDrive.version = "2.0.0.6"
+AutoDrive.version = "2.0.0.7"
 
 AutoDrive.directory = g_currentModDirectory
 

scripts/Manager/UserDataManager.lua

@@ -93,17 +93,16 @@ function ADUserDataManager:saveToXml()
     if g_currentMission.userManager.getUserByConnection then
         local user = g_currentMission.userManager:getUserByConnection(connection)
         if user == nil then
-            -- no client, create a single player user
+            -- no client, create a single player user ID
             local uniqueId = ADUserDataManager.SinglePlayer
-            if self.users[uniqueId] == nil then
-                -- single player user data not loaded before, so use the current data
-                self.users[uniqueId] = {}
-                self.users[uniqueId].hudX = AutoDrive.HudX or 0.5
-                self.users[uniqueId].hudY = AutoDrive.HudY or 0.5
-                self.users[uniqueId].settings = {}
-                for _, sn in pairs(self.userSettingNames) do
-                    self.users[uniqueId].settings[sn] = AutoDrive.getSettingState(sn)
-                end
+
+            -- single player, so use the current data
+            self.users[uniqueId] = {}
+            self.users[uniqueId].hudX = AutoDrive.HudX or 0.5
+            self.users[uniqueId].hudY = AutoDrive.HudY or 0.5
+            self.users[uniqueId].settings = {}
+            for _, sn in pairs(self.userSettingNames) do
+                self.users[uniqueId].settings[sn] = AutoDrive.getSettingState(sn)
             end
         end
     end

scripts/Utils/CollisionDetectionUtils.lua

@@ -16,7 +16,10 @@ function AutoDrive.checkForVehiclesInBox(boundingBox, excludedVehicles)
                 end
             end
         end
-
+        if otherVehicle.spec_conveyorBelt and otherVehicle.spec_motorized and otherVehicle.getIsMotorStarted and otherVehicle:getIsMotorStarted() then
+            -- ignore operating conveyor belts
+            isExcluded = true
+        end
         if (not isExcluded) and otherVehicle ~= nil and otherVehicle.components ~= nil and otherVehicle.size.width ~= nil and otherVehicle.size.length ~= nil and otherVehicle.rootNode ~= nil then
             local x, _, z = getWorldTranslation(otherVehicle.components[1].node)
             local distance = MathUtil.vector2Length(boundingBox[1].x - x, boundingBox[1].z - z)