fix: crash and mopo light bug

Code/client/Services/Generic/CharacterService.cpp

@@ -154,14 +154,14 @@ void CharacterService::OnActorRemoved(const ActorRemovedEvent& acEvent) noexcept
         return;
     }
 
+    auto& formIdComponent = m_world.get<FormIdComponent>(*entityIt);
+    CancelServerAssignment(*entityIt, formIdComponent.Id);
+
     if (m_world.all_of<FormIdComponent>(*entityIt))
         m_world.remove<FormIdComponent>(*entityIt);
 
     if (m_world.orphan(*entityIt))
         m_world.destroy(*entityIt);
-
-    auto& formIdComponent = m_world.get<FormIdComponent>(*entityIt);
-    CancelServerAssignment(*entityIt, formIdComponent.Id);
 }
 
 void CharacterService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept

Code/client/Services/Generic/ObjectService.cpp

@@ -204,7 +204,7 @@ void ObjectService::OnActivate(const ActivateEvent& acEvent) noexcept
 
     if (pEntity == std::end(view))
     {
-        spdlog::error("Activator entity not found for form id {:X}", acEvent.pActivator->formID);
+        //spdlog::error("Activator entity not found for form id {:X}", acEvent.pActivator->formID);
         return;
     }
 

Code/client/Services/Generic/TransportService.cpp

@@ -130,6 +130,8 @@ void TransportService::OnConnected()
 
         auto& entry = request.UserMods.ModList.emplace_back();
         entry.Id = pMod->GetId();
+        if (pMod->IsLite())
+            entry.Id |= 0xE000;
         entry.Filename = pMod->filename;
     }
 

Code/client/Systems/ModSystem.cpp

@@ -100,7 +100,5 @@ void ModSystem::HandleMods(const Mods& acMods) noexcept
                 m_standardToServer[pMod->GetId() & 0xFF] = mod.Id;
             }
         }
-
-        // this should never get hit.
     }
 }

Code/client/World.cpp

@@ -88,7 +88,7 @@ uint64_t World::GetTick() const noexcept
 
 void World::Create() noexcept
 {
-    if(entt::locator<World>::has_value())
+    if (!entt::locator<World>::has_value())
     {
         entt::locator<World>::emplace();
     }

Code/encoding/Structs/Mods.cpp

@@ -21,7 +21,7 @@ void Mods::Serialize(TiltedPhoques::Buffer::Writer& aWriter) const noexcept
 
     for (auto& entry : ModList)
     {
-        aWriter.WriteBits(entry.Id, 12);
+        aWriter.WriteBits(entry.Id, 16);
         Serialization::WriteString(aWriter, entry.Filename);
     }
 }
@@ -35,8 +35,8 @@ void Mods::Deserialize(TiltedPhoques::Buffer::Reader& aReader) noexcept
     ModList.resize(modCount);
     for (size_t i = 0; i < modCount; ++i)
     {
-        aReader.ReadBits(data, 12);
-        ModList[i].Id = data & 0xFFF;
+        aReader.ReadBits(data, 16);
+        ModList[i].Id = data;
         ModList[i].Filename = Serialization::ReadString(aReader);
     }
 }