diff --git a/dGame/dComponents/MovingPlatformComponent.h b/dGame/dComponents/MovingPlatformComponent.h index d78595fe3..f732b9bea 100644 --- a/dGame/dComponents/MovingPlatformComponent.h +++ b/dGame/dComponents/MovingPlatformComponent.h @@ -321,6 +321,9 @@ public: // A mover on a path, run by the server (a rotater only spins: no waypoints) bool IsMover() const; + // Whether the platform follows a path (its attached_path); a simple mover without one has no waypoints + bool HasPath() const { return m_Path != nullptr; } + private: /** diff --git a/dGame/dGameMessages/MovementMessages.cpp b/dGame/dGameMessages/MovementMessages.cpp index df82310dc..cede9c002 100644 --- a/dGame/dGameMessages/MovementMessages.cpp +++ b/dGame/dGameMessages/MovementMessages.cpp @@ -131,6 +131,9 @@ namespace GameMessages { resync.Send(sysAddr); return; } + // A platform without a path has no waypoints to resync to; the client's simple mover reads them anyway and + // crashes (LWOPlatformSimpleMover::Resync 0x00bf9ec0 -> Path::GetWaypointAtIndex on a null path) + if (platform && !platform->HasPath()) return; if (entity.GetLOT() == 6267 || entity.GetLOT() == 16141) return; PlatformResync(entity).Send(sysAddr); }