From 60b626d3eeb120f2321610df68edd099f804b37b Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Fri, 14 Apr 2023 13:21:43 +0200
Subject: [PATCH] don't load npc by themself if they're riding

---
 server/src/rtsim/tick.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/src/rtsim/tick.rs b/server/src/rtsim/tick.rs
index f898cf1cb3..7f2c72cd6d 100644
--- a/server/src/rtsim/tick.rs
+++ b/server/src/rtsim/tick.rs
@@ -332,6 +332,8 @@ impl<'a> System<'a> for Sys {
             // loaded
             if matches!(npc.mode, SimulationMode::Simulated)
                 && chunk_states.0.get(chunk).map_or(false, |c| c.is_some())
+                // Riding npcs will be spawned by the vehicle.
+                && npc.riding.is_none()
             {
                 npc.mode = SimulationMode::Loaded;
                 let entity_info = get_npc_entity_info(npc, &data.sites, index.as_index_ref());