pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-26 19:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
KayenEQ
2021-08-10 16:33:21 -04:00
parent 24c4d6da97
commit 34a4116b14
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+4 -2
View File
@@ -2954,13 +2954,15 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
if (IsPet()) { if (IsPet()) {
Mob* petowner = GetOwner(); Mob* petowner = GetOwner();
if (petowner) { if (petowner) {
int shield_duration = spells[spell_id].base[i] * 12 * 1000; int shield_duration = spells[spell_id].base[i] * 12 * 1000;
int shld_target_mitigation = spells[spell_id].base2[i] ? spells[spell_id].base2[i] : 50; int shld_target_mitigation = spells[spell_id].base2[i] ? spells[spell_id].base2[i] : 50;
int shlder_mitigation = spells[spell_id].max[i] ? spells[spell_id].base2[i] : 50; int shlder_mitigation = spells[spell_id].max[i] ? spells[spell_id].base2[i] : 50;
ShieldAbility(petowner->GetID(), 25, shield_duration, shld_target_mitigation, shlder_mitigation); ShieldAbility(petowner->GetID(), 25, shield_duration, shld_target_mitigation, shlder_mitigation);
break; break;
} }
}
}
case SE_Weapon_Stance: { case SE_Weapon_Stance: {
if (IsClient()) { if (IsClient()) {