1 files changed, 14 insertions, 14 deletions

diff --git a/modules/bullet/area_bullet.cpp b/modules/bullet/area_bullet.cpp
index 9d46e4fe30..bfb452d109 100644
--- a/modules/bullet/area_bullet.cpp
+++ b/modules/bullet/area_bullet.cpp
@@ -68,7 +68,9 @@ AreaBullet::AreaBullet() :
 }
 
 AreaBullet::~AreaBullet() {
-	remove_all_overlapping_instantly();
+	// signal are handled by godot, so just clear without notify
+	for (int i = overlappingObjects.size() - 1; 0 <= i; --i)
+		overlappingObjects[i].object->on_exit_area(this);
 }
 
 void AreaBullet::dispatch_callbacks() {
@@ -121,23 +123,21 @@ void AreaBullet::scratch() {
 	isScratched = true;
 }
 
-void AreaBullet::remove_all_overlapping_instantly() {
-	CollisionObjectBullet *supportObject;
+void AreaBullet::clear_overlaps(bool p_notify) {
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
-		supportObject = overlappingObjects[i].object;
-		call_event(supportObject, PhysicsServer::AREA_BODY_REMOVED);
-		supportObject->on_exit_area(this);
+		if (p_notify)
+			call_event(overlappingObjects[i].object, PhysicsServer::AREA_BODY_REMOVED);
+		overlappingObjects[i].object->on_exit_area(this);
 	}
 	overlappingObjects.clear();
 }
 
-void AreaBullet::remove_overlapping_instantly(CollisionObjectBullet *p_object) {
-	CollisionObjectBullet *supportObject;
+void AreaBullet::remove_overlap(CollisionObjectBullet *p_object, bool p_notify) {
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
-		supportObject = overlappingObjects[i].object;
-		if (supportObject == p_object) {
-			call_event(supportObject, PhysicsServer::AREA_BODY_REMOVED);
-			supportObject->on_exit_area(this);
+		if (overlappingObjects[i].object == p_object) {
+			if (p_notify)
+				call_event(overlappingObjects[i].object, PhysicsServer::AREA_BODY_REMOVED);
+			overlappingObjects[i].object->on_exit_area(this);
 			overlappingObjects.remove(i);
 			break;
 		}
@@ -236,7 +236,7 @@ void AreaBullet::set_param(PhysicsServer::AreaParameter p_param, const Variant &
 			set_spOv_gravityPointAttenuation(p_value);
 			break;
 		default:
-			print_line("The Bullet areas dosn't suppot this param: " + itos(p_param));
+			print_line("The Bullet areas doesn't suppot this param: " + itos(p_param));
 	}
 }
 
@@ -259,7 +259,7 @@ Variant AreaBullet::get_param(PhysicsServer::AreaParameter p_param) const {
 		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
 			return spOv_gravityPointAttenuation;
 		default:
-			print_line("The Bullet areas dosn't suppot this param: " + itos(p_param));
+			print_line("The Bullet areas doesn't suppot this param: " + itos(p_param));
 			return Variant();
 	}
 }