Meer Mage fix

This commit is contained in:
daedalus 2010-01-23 20:15:53 +00:00
parent f1f319a249
commit 42e4e9987d

View file

@ -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;
}
}
}