Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-04-17 21:26:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

_handle_aura_heal and _handle_aura_damage now won't complain anymore if the aura's caster is invalid.

Browse Source
This commit is contained in:
Relintai 2020-07-16 15:56:48 +02:00
parent 9839cb4972
commit 49a347b0a2
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
data/auras/aura.cpp
View File

@ -1129,16 +1129,19 @@ void Aura::_calculate_initial_damage(Ref<AuraData> aura_data, Ref<AuraApplyInfo>
}
void Aura::_handle_aura_damage(Ref<AuraData> aura_data, Ref<SpellDamageInfo> info) {
ERR_FAIL_COND(!INSTANCE_VALIDATE(info->dealer_get()));
if (info->dealer_get() && !INSTANCE_VALIDATE(info->dealer_get())) {
info->dealer_set(NULL);
}
Math::randomize();
info->damage_set(_damage_min + (Math::rand() % (_damage_max = _damage_min)));
info->source_set_type(SpellDamageInfo::DAMAGE_SOURCE_AURA);
ERR_FAIL_COND(!INSTANCE_VALIDATE(info->dealer_get()));
info->dealer_get()->sdeal_damage_to(info);
if (info->dealer_get()) {
info->dealer_get()->sdeal_damage_to(info);
} else {
info->receiver_get()->stake_damage(info);
}
}
void Aura::_sapply_passives_heal_receive(Ref<SpellHealInfo> data) {
@ -1154,16 +1157,19 @@ void Aura::_calculate_initial_heal(Ref<AuraData> aura_data, Ref<AuraApplyInfo> i
}
void Aura::_handle_aura_heal(Ref<AuraData> aura_data, Ref<SpellHealInfo> info) {
ERR_FAIL_COND(!INSTANCE_VALIDATE(info->dealer_get()));
if (info->dealer_get() && !INSTANCE_VALIDATE(info->dealer_get())) {
info->dealer_set(NULL);
}
Math::randomize();
info->heal_set(_heal_min + (Math::rand() % (_heal_max = _heal_min)));
info->source_set_type(SpellHealInfo::HEAL_SOURCE_AURA);
ERR_FAIL_COND(!INSTANCE_VALIDATE(info->dealer_get()));
info->dealer_get()->sdeal_heal_to(info);
if (info->dealer_get()) {
info->dealer_get()->sdeal_heal_to(info);
} else {
info->receiver_get()->stake_heal(info);
}
}
void Aura::_validate_property(PropertyInfo &property) const {