diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index a1cdb1f8..ede0920a 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2078,10 +2078,12 @@ std::shared_ptr<BornPoint> Room::GetBornPoint(int point_uniid)
 
 void Room::CreateSpawnPoints()
 {
-    for (size_t i = 0; i < 10; ++i) {
-        int uniid = AllocUniid();
-        std::shared_ptr<BornPoint> born_point = std::make_shared<BornPoint>();
-        born_point_hash_[uniid] = born_point;
+    if (born_point_hash_.empty()) {
+        for (size_t i = 0; i < 10; ++i) {
+            int uniid = AllocUniid();
+            std::shared_ptr<BornPoint> born_point = std::make_shared<BornPoint>();
+            born_point_hash_[uniid] = born_point;
+        }
     }
 }
 
@@ -3725,7 +3727,8 @@ int Room::GetPolyExtFlag(int poly_idx)
 
 void Room::CreateWorldObjects()
 {
-    for (auto& obj : GetMapMeta()->_world_objects) {
+    for (auto& itr : GetMapMeta()->_world_objects) {
+        std::shared_ptr<mt::WorldObject> obj = itr;
         switch ((WorldObjectType_e)obj->object_type) {
         case WorldObjectType_e::kLootType:
             {
@@ -3745,7 +3748,8 @@ void Room::CreateWorldObjects()
                      obj->object_id,
                      obj->pos.x,
                      obj->pos.y,
-                     obj->pos.z
+                     obj->pos.z,
+                     std::make_shared<a8::Args>(std::vector<std::any>({obj}))
                      );
             }
             break;