World can now draw properly, and camera follows player

1 files changed, 4 insertions, 4 deletions

diff --git a/src/script.cpp b/src/script.cpp
index cf5b2dd..fd99228 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -188,10 +188,6 @@ sol::table ScriptSystem::spawn(sol::object param)
                 e.assign<Velocity>(Velocity().FromLua(tab["Velocity"])).get();
         }
 
-        if (tab["Player"] != nullptr) {
-            (*toRet)["Player"] = e.assign<Player>().get();
-        }
-
         if (tab["Physics"] != nullptr) {
             if (!e.has_component<Position>()) // Position must exist for phys.
                 (*toRet)["Position"] = e.assign<Position>().get();
@@ -214,6 +210,10 @@ sol::table ScriptSystem::spawn(sol::object param)
             e.assign<EventListener>(listeners);
         }
 
+        if (tab["Player"] != nullptr) {
+            (*toRet)["Player"] = e.assign<Player>().get();
+        }
+
     } else {
         // TODO better logging
         std::cerr << "Parameter to spawn() must be a table!" << std::endl;