1 files changed, 17 insertions, 10 deletions

diff --git a/scene/3d/joint_3d.cpp b/scene/3d/joint_3d.cpp
index 36abd0a5c5..c22e3f6d91 100644
--- a/scene/3d/joint_3d.cpp
+++ b/scene/3d/joint_3d.cpp
@@ -76,15 +76,15 @@ void Joint3D::_update_joint(bool p_only_free) {
 	PhysicsBody3D *body_b = Object::cast_to<PhysicsBody3D>(node_b);
 
 	if (node_a && !body_a && node_b && !body_b) {
-		warning = TTR("Node A and Node B must be PhysicsBody3Ds");
+		warning = RTR("Node A and Node B must be PhysicsBody3Ds");
 	} else if (node_a && !body_a) {
-		warning = TTR("Node A must be a PhysicsBody3D");
+		warning = RTR("Node A must be a PhysicsBody3D");
 	} else if (node_b && !body_b) {
-		warning = TTR("Node B must be a PhysicsBody3D");
+		warning = RTR("Node B must be a PhysicsBody3D");
 	} else if (!body_a && !body_b) {
-		warning = TTR("Joint is not connected to any PhysicsBody3Ds");
+		warning = RTR("Joint is not connected to any PhysicsBody3Ds");
 	} else if (body_a == body_b) {
-		warning = TTR("Node A and Node B must be different PhysicsBody3Ds");
+		warning = RTR("Node A and Node B must be different PhysicsBody3Ds");
 	} else {
 		warning = String();
 	}
@@ -124,7 +124,7 @@ void Joint3D::set_node_a(const NodePath &p_node_a) {
 		return;
 	}
 
-	if (joint.is_valid()) {
+	if (is_configured()) {
 		_disconnect_signals();
 	}
 
@@ -141,7 +141,7 @@ void Joint3D::set_node_b(const NodePath &p_node_b) {
 		return;
 	}
 
-	if (joint.is_valid()) {
+	if (is_configured()) {
 		_disconnect_signals();
 	}
 
@@ -166,15 +166,18 @@ int Joint3D::get_solver_priority() const {
 
 void Joint3D::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_READY: {
+		case NOTIFICATION_POST_ENTER_TREE: {
+			if (is_configured()) {
+				_disconnect_signals();
+			}
 			_update_joint();
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
-			if (joint.is_valid()) {
+			if (is_configured()) {
 				_disconnect_signals();
-				_update_joint(true);
 			}
+			_update_joint(true);
 		} break;
 	}
 }
@@ -183,6 +186,10 @@ void Joint3D::set_exclude_nodes_from_collision(bool p_enable) {
 	if (exclude_from_collision == p_enable) {
 		return;
 	}
+	if (is_configured()) {
+		_disconnect_signals();
+	}
+	_update_joint(true);
 	exclude_from_collision = p_enable;
 	_update_joint();
 }