diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index e175a7f1e..ef9219c2c 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index 4c141a8b3..fd173dd08 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -84,8 +84,6 @@ public abstract class Entity } } - public HullData HullData { get; } - public EntitySettings Settings { get; } public bool OverrideShutdown { get; set; } @@ -263,8 +261,10 @@ public abstract class Entity ItemManager = itemManager; Zone = zone; Hull = hull; - HullData = itemManager.GetData(hull) as HullData; - Name = HullData.Name; + var typedHull = itemManager.GetRuntimeItem(hull); + if (typedHull == null) + throw new InvalidOperationException($"Unable to construct entity: missing typed hull row for {hull?.Data?.ItemId}"); + Name = typedHull.Name; MapEntity(); WeaponGroups = new (List weapons, List items)[itemManager.GameplaySettings.WeaponGroupCount]; for(int i=0; i