From 772bfd0575d9fd1d7c89c2239417f0400afbe3a3 Mon Sep 17 00:00:00 2001
From: Alexsandro Percy <alexsandro.percy@gmail.com>
Date: Fri, 30 Dec 2022 08:46:39 -0300
Subject: [PATCH] fix passenger logout error and added emote support

---
 automobiles_lib/init.lua | 50 ++++++++++++++++++++++------------------
 automobiles_lib/mod.conf |  1 +
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/automobiles_lib/init.lua b/automobiles_lib/init.lua
index 18cab12..49eddeb 100755
--- a/automobiles_lib/init.lua
+++ b/automobiles_lib/init.lua
@@ -100,6 +100,7 @@ function automobiles_lib.attach_driver(self, player)
                 end
             end
             player_api.set_animation(player, "sit", speed)
+            if emote then emote.start(player:get_player_name(), "sit") end
         end
     end)
 end
@@ -165,6 +166,7 @@ function automobiles_lib.attach_pax(self, player, onside)
                         end
                     end
                     player_api.set_animation(player, "sit", speed)
+                    if emote then emote.start(player:get_player_name(), "sit") end
                 end
             end)
 
@@ -208,29 +210,33 @@ function automobiles_lib.attach_pax(self, player, onside)
 end
 
 function automobiles_lib.dettach_pax(self, player)
-    local name = player:get_player_name() --self._passenger
-
-    -- passenger clicked the object => driver gets off the vehicle
-    if self._passenger == name then
-        self._passenger = nil
-    else
-        --[[for i = 10,1,-1
-        do
-            if self._passengers[i] == name then
-                self._passengers[i] = nil
-                break
-            end
-        end]]--
-    end
-
-    -- detach the player
     if player then
-        --player:set_properties({physical=true})
-        player:set_detach()
-        player_api.player_attached[name] = nil
-        player_api.set_animation(player, "stand")
-        player:set_eye_offset({x=0,y=0,z=0},{x=0,y=0,z=0})
-        --remove_physics_override(player, {speed=1,gravity=1,jump=1})
+        local name = player:get_player_name() --self._passenger
+
+        -- passenger clicked the object => driver gets off the vehicle
+        if self._passenger == name then
+            self._passenger = nil
+        else
+            --[[for i = 10,1,-1
+            do
+                if self._passengers[i] == name then
+                    self._passengers[i] = nil
+                    break
+                end
+            end]]--
+        end
+
+        -- detach the player
+        if player then
+            --player:set_properties({physical=true})
+            player:set_detach()
+            player_api.player_attached[name] = nil
+            player_api.set_animation(player, "stand")
+            player:set_eye_offset({x=0,y=0,z=0},{x=0,y=0,z=0})
+            --remove_physics_override(player, {speed=1,gravity=1,jump=1})
+        end
+    else
+        self._passenger = nil
     end
 end
 
diff --git a/automobiles_lib/mod.conf b/automobiles_lib/mod.conf
index c91c8b9..da6301e 100755
--- a/automobiles_lib/mod.conf
+++ b/automobiles_lib/mod.conf
@@ -1,2 +1,3 @@
 name = automobiles_lib
 depends=biofuel,player_api
+optional_depends=emote