From 7e8212144c3a60158f7689a0ac72eb6cd52c522f Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Fri, 1 Nov 2019 21:20:22 +0100
Subject: [PATCH] Small aura remove, and add event calls cleanup.

---
 entities/entity.cpp | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/entities/entity.cpp b/entities/entity.cpp
index 92da1ab..7cf51f3 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -2351,7 +2351,7 @@ void Entity::cadd_aura(Ref<AuraData> aura) {
 
 	_c_auras.push_back(aura);
 
-	aura->get_aura()->con_aura_added(aura);
+	con_aura_added(aura);
 
 	emit_signal("caura_added", aura);
 }
@@ -2375,14 +2375,7 @@ void Entity::cremove_aura(Ref<AuraData> aura) {
 	}
 
 	if (removed) {
-		aura->get_aura()->con_aura_removed(aura);
-
-		if (_s_entity_data.is_valid()) {
-			_s_entity_data->con_aura_removed(aura);
-		}
-
-		if (has_method("_con_aura_removed"))
-			call("_con_aura_removed", aura);
+		con_aura_removed(aura);
 
 		emit_signal("caura_removed", a);
 	}
@@ -2391,8 +2384,6 @@ void Entity::cremove_aura(Ref<AuraData> aura) {
 void Entity::cremove_aura_exact(Ref<AuraData> aura) {
 	ERR_FAIL_COND(!aura.is_valid());
 
-	aura->get_aura()->con_aura_removed(aura);
-
 	for (int i = 0; i < _c_auras.size(); i++) {
 		if (_c_auras.get(i) == aura) {
 			_c_auras.remove(i);
@@ -2400,12 +2391,7 @@ void Entity::cremove_aura_exact(Ref<AuraData> aura) {
 		}
 	}
 
-	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_aura_removed(aura);
-	}
-
-	if (has_method("_con_aura_removed"))
-		call("_con_aura_removed", aura);
+	con_aura_removed(aura);
 
 	emit_signal("caura_removed", aura);
 }
@@ -2413,8 +2399,6 @@ void Entity::cremove_aura_exact(Ref<AuraData> aura) {
 void Entity::cremove_aura_dispelled(Ref<AuraData> aura) {
 	ERR_FAIL_COND(!aura.is_valid());
 
-	aura->get_aura()->con_aura_removed(aura);
-
 	for (int i = 0; i < _c_auras.size(); i++) {
 		if (_c_auras.get(i) == aura) {
 			_c_auras.remove(i);
@@ -2422,12 +2406,7 @@ void Entity::cremove_aura_dispelled(Ref<AuraData> aura) {
 		}
 	}
 
-	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_aura_removed(aura);
-	}
-
-	if (has_method("_con_aura_removed"))
-		call("_con_aura_removed", aura);
+	con_aura_removed(aura);
 
 	emit_signal("caura_removed_dispelled", aura);
 }
@@ -2444,8 +2423,6 @@ void Entity::caura_refreshed(Ref<AuraData> aura) {
 void Entity::cremove_aura_expired(Ref<AuraData> aura) {
 	ERR_FAIL_COND(!aura.is_valid());
 
-	aura->get_aura()->con_aura_removed(aura);
-
 	for (int i = 0; i < _c_auras.size(); i++) {
 		if (_c_auras.get(i) == aura) {
 			_c_auras.remove(i);
@@ -2453,12 +2430,7 @@ void Entity::cremove_aura_expired(Ref<AuraData> aura) {
 		}
 	}
 
-	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_aura_removed(aura);
-	}
-
-	if (has_method("_con_aura_removed"))
-		call("_con_aura_removed", aura);
+	con_aura_removed(aura);
 
 	emit_signal("caura_removed_expired", aura);
 }