Suspend physics on vehicle mounting

Author: nickelpro

spockbot/plugins/helpers/clientinfo.py

@@ -86,6 +86,7 @@ def __init__(self):
         self.eid = 0
         self.name = ""
         self.uuid = ""
+        self.mount = None
         self.abilities = Abilities()
         self.game_info = GameInfo()
         self.spawn_position = Position()
@@ -104,6 +105,7 @@ class ClientInfoPlugin(PluginBase):
     events = {
         'LOGIN<Login Success': 'handle_login_success',
         'PLAY<Join Game': 'handle_join_game',
+        'PLAY<Attach Entity': 'handle_attach_entity',
         'PLAY<Spawn Position': 'handle_spawn_position',
         'PLAY<Update Health': 'handle_update_health',
         'PLAY<Player Position and Look': 'handle_position_update',
@@ -133,6 +135,15 @@ def handle_join_game(self, name, packet):
         self.client_info.game_info.set_dict(packet.data)
         self.event.emit('client_join_game', self.client_info.game_info)
 
+    def handle_attach_entity(self, name, packet):
+        eid, v_eid = packet.data['eid'], packet.data['v_eid']
+        if eid == self.client_info.eid:
+            self.client_info.mount = v_eid
+            self.event.emit('client_mount', v_eid)
+        elif v_eid == self.client_info.mount and eid == -1:
+            self.client_info.mount = None
+            self.event.emit('client_unmount', v_eid)
+
     # Spawn Position - Update client Spawn Position state
     def handle_spawn_position(self, name, packet):
         self.client_info.spawn_position.set_dict(packet.data['location'])
@@ -171,9 +182,9 @@ def handle_player_list(self, name, packet):
                 self.client_info.player_list[pl['uuid']] = item
                 self.uuids[pl['uuid']] = item
                 self.event.emit('client_add_player', item)
-            elif act in [const.PL_UPDATE_GAMEMODE,
+            elif act in (const.PL_UPDATE_GAMEMODE,
                          const.PL_UPDATE_LATENCY,
-                         const.PL_UPDATE_DISPLAY]:
+                         const.PL_UPDATE_DISPLAY):
                 if pl['uuid'] in self.uuids:
                     item = self.uuids[pl['uuid']]
                     item.set_dict(pl)

spockbot/plugins/helpers/physics.py

@@ -70,7 +70,9 @@ class PhysicsPlugin(PluginBase):
     events = {
         'physics_tick': 'physics_tick',
         'client_tick': 'client_tick',
-        'client_position_update': 'pause_physics',
+        'client_position_update': 'skip_physics',
+        'client_mount': 'suspend_physics',
+        'client_unmount': 'resume_physics',
     }
 
     def __init__(self, ploader, settings):
@@ -84,10 +86,17 @@ def __init__(self, ploader, settings):
         self.pc = PhysicsCore(self.pos, self.vec, self.clientinfo.abilities)
         ploader.provides('Physics', self.pc)
 
-    def pause_physics(self, _=None, __=None):
+    def skip_physics(self, _=None, __=None):
         self.vec.zero()
         self.skip_tick = True
 
+    def suspend_physics(self, _=None, __=None):
+        self.vec.zero()
+        self.event.unreg_event_handler('physics_tick', self.physics_tick)
+
+    def resume_physics(self, _=None, __=None):
+        self.event.reg_event_handler('physics_tick', self.physics_tick)
+
     def client_tick(self, name, data):
         self.net.push_packet('PLAY>Player Position and Look',
                              self.clientinfo.position.get_dict())