From 42e4e9987d6a062664299f18609523f3742eea77 Mon Sep 17 00:00:00 2001
From: daedalus <daedalus@a9ff2418-eebe-19e0-0898-3207744d8c45>
Date: Sat, 23 Jan 2010 20:15:53 +0000
Subject: [PATCH] Meer Mage fix

---
 Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs
index 1e643dcf3..c9b5b4191 100644
--- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs
+++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs
@@ -92,9 +92,12 @@ namespace Server.Mobiles
 					{
 						BaseCreature bc = (BaseCreature)combatant;
 
-						if( bc.Controlled  )
+						if( bc.Controlled && bc.ControlMaster != null && !bc.ControlMaster.Deleted && bc.ControlMaster.Alive )
 						{
-							combatant = bc.ControlMaster;
+							if ( bc.ControlMaster.Map == this.Map && bc.ControlMaster.InRange( this, 12 ) && !UnderEffect( bc.ControlMaster ) )
+							{
+								combatant = bc.ControlMaster;
+							}
 						}
 					}