diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index fff399f8f9e..1a53f684e8a 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -380,6 +380,10 @@ void Area2D::_notification(int p_what) { switch (p_what) { + case NOTIFICATION_READY: { + + is_ready = true; + } break; case NOTIFICATION_EXIT_TREE: { monitoring_stored = monitoring; @@ -387,8 +391,8 @@ void Area2D::_notification(int p_what) { _clear_monitoring(); } break; case NOTIFICATION_ENTER_TREE: { - - set_enable_monitoring(monitoring_stored); + if (is_ready) + set_enable_monitoring(monitoring_stored); } break; } } @@ -646,7 +650,8 @@ Area2D::Area2D() monitorable = false; collision_mask = 1; layer_mask = 1; - monitoring_stored = true; + monitoring_stored = false; + is_ready = false; set_enable_monitoring(true); set_monitorable(true); } diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h index 8e854d4744b..1860127cb54 100644 --- a/scene/2d/area_2d.h +++ b/scene/2d/area_2d.h @@ -60,6 +60,7 @@ private: bool monitoring_stored; bool monitorable; bool locked; + bool is_ready; void _body_inout(int p_status, const RID &p_body, int p_instance, int p_body_shape, int p_area_shape); diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index f0dec5d2e37..b4c63d6292f 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -227,6 +227,10 @@ void Area::_clear_monitoring() { Object *obj = ObjectDB::get_instance(E->key()); Node *node = obj ? obj->cast_to() : NULL; ERR_CONTINUE(!node); + + node->disconnect(SceneStringNames::get_singleton()->enter_tree, this, SceneStringNames::get_singleton()->_body_enter_tree); + node->disconnect(SceneStringNames::get_singleton()->exit_tree, this, SceneStringNames::get_singleton()->_body_exit_tree); + if (!E->get().in_tree) continue; @@ -236,9 +240,6 @@ void Area::_clear_monitoring() { } emit_signal(SceneStringNames::get_singleton()->body_exit, obj); - - node->disconnect(SceneStringNames::get_singleton()->enter_tree, this, SceneStringNames::get_singleton()->_body_enter_tree); - node->disconnect(SceneStringNames::get_singleton()->exit_tree, this, SceneStringNames::get_singleton()->_body_exit_tree); } } @@ -253,6 +254,10 @@ void Area::_clear_monitoring() { Object *obj = ObjectDB::get_instance(E->key()); Node *node = obj ? obj->cast_to() : NULL; ERR_CONTINUE(!node); + + node->disconnect(SceneStringNames::get_singleton()->enter_tree, this, SceneStringNames::get_singleton()->_area_enter_tree); + node->disconnect(SceneStringNames::get_singleton()->exit_tree, this, SceneStringNames::get_singleton()->_area_exit_tree); + if (!E->get().in_tree) continue; @@ -262,16 +267,27 @@ void Area::_clear_monitoring() { } emit_signal(SceneStringNames::get_singleton()->area_exit, obj); - - node->disconnect(SceneStringNames::get_singleton()->enter_tree, this, SceneStringNames::get_singleton()->_area_enter_tree); - node->disconnect(SceneStringNames::get_singleton()->exit_tree, this, SceneStringNames::get_singleton()->_area_exit_tree); } } } void Area::_notification(int p_what) { - if (p_what == NOTIFICATION_EXIT_TREE) { - _clear_monitoring(); + switch (p_what) { + + case NOTIFICATION_READY: { + + is_ready = true; + } break; + case NOTIFICATION_EXIT_TREE: { + + monitoring_stored = monitoring; + set_enable_monitoring(false); + _clear_monitoring(); + } break; + case NOTIFICATION_ENTER_TREE: { + if (is_ready) + set_enable_monitoring(monitoring_stored); + } break; } } @@ -627,6 +643,8 @@ Area::Area() monitoring = false; collision_mask = 1; layer_mask = 1; + monitoring_stored = false; + is_ready = false; set_ray_pickable(false); set_enable_monitoring(true); set_monitorable(true); diff --git a/scene/3d/area.h b/scene/3d/area.h index 75c66c88beb..718243fdb0a 100644 --- a/scene/3d/area.h +++ b/scene/3d/area.h @@ -57,8 +57,10 @@ private: uint32_t layer_mask; int priority; bool monitoring; + bool monitoring_stored; bool monitorable; bool locked; + bool is_ready; void _body_inout(int p_status, const RID &p_body, int p_instance, int p_body_shape, int p_area_shape);