[Client] Disable leveled creatures from their class instead of scene.cpp

apps/openmw/mwclass/creaturelevlist.cpp

@@ -120,8 +120,17 @@ namespace MWClass
             const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             MWWorld::ManualRef manualRef(store, id);
             manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
-            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(manualRef.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
-            customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
+
+            /*
+                Start of tes3mp change (major)
+
+                Don't spawn leveled creatures in multiplayer; they'll be spawned when the server requests them
+            */
+            //MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(manualRef.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
+            //customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
+            /*
+                End of tes3mp change (major)
+            */
             customData.mSpawn = false;
         }
         else

apps/openmw/mwworld/scene.cpp

@@ -8,7 +8,6 @@
 
     Include additional headers for multiplayer purposes
 */
-#include <components/openmw-mp/Log.hpp>
 #include "../mwmp/Main.hpp"
 #include "../mwmp/LocalPlayer.hpp"
 /*
@@ -154,17 +153,6 @@ namespace
                     ptr.getCellRef().setScale(2);
             }
 
-            /*
-                Start of tes3mp change (major)
-
-                Don't insert leveled creatures; they'll be inserted later on when the server needs them
-            */
-            if (ptr.getTypeName() == typeid(ESM::CreatureLevList).name())
-                continue;
-            /*
-                End of tes3mp change (major)
-            */
-
             if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
             {
                 try