Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-05-11 22:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Now The aura's added, and removed clientside signals are also called properly.

Browse Source
This commit is contained in:
Relintai 2019-09-08 00:02:21 +02:00
parent 9bbca6d4b5
commit 7640ff7884
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
entities/entity.cpp
View File

@ -1399,11 +1399,14 @@ void Entity::saura_refreshed(Ref<AuraData> aura) {
SEND_RPC(rpc("caura_refreshed", aura), caura_refreshed(aura)); SEND_RPC(rpc("caura_refreshed", aura), caura_refreshed(aura));
} }
void Entity::cadd_aura(Ref<AuraData> data) { void Entity::cadd_aura(Ref<AuraData> aura) {
ERR_FAIL_COND(!data.is_valid()); ERR_FAIL_COND(!aura.is_valid());
_c_auras.push_back(data); _c_auras.push_back(aura);
emit_signal("caura_added", data);
aura->get_aura()->con_aura_added(aura);
emit_signal("caura_added", aura);
} }
void Entity::cremove_aura(Ref<AuraData> aura) { void Entity::cremove_aura(Ref<AuraData> aura) {
@ -1425,6 +1428,8 @@ void Entity::cremove_aura(Ref<AuraData> aura) {
} }
if (removed) { if (removed) {
aura->get_aura()->con_aura_removed(aura);
if (_s_character_class.is_valid()) { if (_s_character_class.is_valid()) {
_s_character_class->con_aura_removed(aura); _s_character_class->con_aura_removed(aura);
} }
@ -1439,6 +1444,8 @@ void Entity::cremove_aura(Ref<AuraData> aura) {
void Entity::cremove_aura_exact(Ref<AuraData> aura) { void Entity::cremove_aura_exact(Ref<AuraData> aura) {
ERR_FAIL_COND(!aura.is_valid()); ERR_FAIL_COND(!aura.is_valid());
aura->get_aura()->con_aura_removed(aura);
for (int i = 0; i < _c_auras.size(); i++) { for (int i = 0; i < _c_auras.size(); i++) {
if (_c_auras.get(i) == aura) { if (_c_auras.get(i) == aura) {
_c_auras.remove(i); _c_auras.remove(i);
@ -1459,6 +1466,8 @@ void Entity::cremove_aura_exact(Ref<AuraData> aura) {
void Entity::cremove_aura_dispelled(Ref<AuraData> aura) { void Entity::cremove_aura_dispelled(Ref<AuraData> aura) {
ERR_FAIL_COND(!aura.is_valid()); ERR_FAIL_COND(!aura.is_valid());
aura->get_aura()->con_aura_removed(aura);
for (int i = 0; i < _c_auras.size(); i++) { for (int i = 0; i < _c_auras.size(); i++) {
if (_c_auras.get(i) == aura) { if (_c_auras.get(i) == aura) {
_c_auras.remove(i); _c_auras.remove(i);
@ -1488,6 +1497,8 @@ void Entity::caura_refreshed(Ref<AuraData> aura) {
void Entity::cremove_aura_expired(Ref<AuraData> aura) { void Entity::cremove_aura_expired(Ref<AuraData> aura) {
ERR_FAIL_COND(!aura.is_valid()); ERR_FAIL_COND(!aura.is_valid());
aura->get_aura()->con_aura_removed(aura);
for (int i = 0; i < _c_auras.size(); i++) { for (int i = 0; i < _c_auras.size(); i++) {
if (_c_auras.get(i) == aura) { if (_c_auras.get(i) == aura) {
_c_auras.remove(i); _c_auras.remove(i);