From 34a4116b144224573e2da78e3269865880115655 Mon Sep 17 00:00:00 2001
From: KayenEQ <kayen85@gmail.com>
Date: Tue, 10 Aug 2021 16:33:21 -0400
Subject: [PATCH] fix merge error

---
 zone/spell_effects.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index c2dfa996a..6afa84c0b 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -2954,13 +2954,15 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				if (IsPet()) {
 					Mob* petowner = GetOwner();
 					if (petowner) {
-						
+
 						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 shlder_mitigation = spells[spell_id].max[i] ? spells[spell_id].base2[i] : 50;
 						ShieldAbility(petowner->GetID(), 25, shield_duration, shld_target_mitigation, shlder_mitigation);
-            break;
+						break;
 					}
+				}
+			}
 
 			case SE_Weapon_Stance: {
 				if (IsClient()) {