Engine: Loop through blocks later in getEntity()

Author: adazem009

src/engine/internal/engine.cpp

@@ -1486,11 +1486,6 @@ std::shared_ptr<Comment> Engine::getComment(const std::string &id)
 // Returns the entity with the given ID. \see IEntity
 std::shared_ptr<Entity> Engine::getEntity(const std::string &id)
 {
-    // Blocks
-    auto block = getBlock(id);
-    if (block)
-        return std::static_pointer_cast<Entity>(block);
-
     // Variables
     auto variable = getVariable(id);
     if (variable)
@@ -1506,6 +1501,11 @@ std::shared_ptr<Entity> Engine::getEntity(const std::string &id)
     if (broadcast)
         return std::static_pointer_cast<Entity>(broadcast);
 
+    // Blocks
+    auto block = getBlock(id);
+    if (block)
+        return std::static_pointer_cast<Entity>(block);
+
     // Comments
     auto comment = getComment(id);
     if (comment)