Bird fix, null map mobiles fixed

This commit is contained in:
asayre 2006-10-26 04:28:35 +00:00
parent b2ab540a59
commit cdda8cd854
8 changed files with 23 additions and 7 deletions

View file

@ -44,8 +44,8 @@ namespace Server.Mobiles
SetSkill( SkillName.Tactics, 4.0, 6.0 ); SetSkill( SkillName.Tactics, 4.0, 6.0 );
SetSkill( SkillName.MagicResist, 4.0, 5.0 ); SetSkill( SkillName.MagicResist, 4.0, 5.0 );
SetFameLevel( 1 ); Fame = 150;
SetKarmaLevel( 0 ); Karma = 0;
Tamable = true; Tamable = true;
ControlSlots = 1; ControlSlots = 1;
@ -105,8 +105,8 @@ namespace Server.Mobiles
SetSkill( SkillName.Tactics, 4.0, 6.0 ); SetSkill( SkillName.Tactics, 4.0, 6.0 );
SetSkill( SkillName.MagicResist, 4.0, 5.0 ); SetSkill( SkillName.MagicResist, 4.0, 5.0 );
SetFameLevel( 1 ); Fame = 150;
SetKarmaLevel( 0 ); Karma = 0;
Tamable = true; Tamable = true;
ControlSlots = 1; ControlSlots = 1;

View file

@ -115,6 +115,9 @@ namespace Server.Mobiles
public void BeginSavageDance() public void BeginSavageDance()
{ {
if( this.Map == null )
return;
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 8 ) ) foreach ( Mobile m in this.GetMobilesInRange( 8 ) )

View file

@ -53,7 +53,7 @@ namespace Server.Mobiles
public override void OnDamagedBySpell( Mobile caster ) public override void OnDamagedBySpell( Mobile caster )
{ {
if ( caster != this && 0.25 > Utility.RandomDouble() ) if ( this.Map != null && caster != this && 0.25 > Utility.RandomDouble() )
{ {
BaseCreature spawn = new PlagueSpawn( this ); BaseCreature spawn = new PlagueSpawn( this );
@ -71,7 +71,7 @@ namespace Server.Mobiles
public override void OnGotMeleeAttack( Mobile attacker ) public override void OnGotMeleeAttack( Mobile attacker )
{ {
if ( attacker != this && 0.25 > Utility.RandomDouble() ) if ( this.Map != null && attacker != this && 0.25 > Utility.RandomDouble() )
{ {
BaseCreature spawn = new PlagueSpawn( this ); BaseCreature spawn = new PlagueSpawn( this );

View file

@ -81,6 +81,9 @@ namespace Server.Mobiles
private void DoCounter( Mobile attacker ) private void DoCounter( Mobile attacker )
{ {
if( this.Map == null )
return;
if ( attacker is BaseCreature && ((BaseCreature)attacker).BardProvoked ) if ( attacker is BaseCreature && ((BaseCreature)attacker).BardProvoked )
return; return;

View file

@ -132,6 +132,9 @@ namespace Server.Mobiles
public void CheckQueen() public void CheckQueen()
{ {
if( this.Map == null )
return;
if ( !m_SpawnedQueen ) if ( !m_SpawnedQueen )
{ {
this.Say( 1042153 ); // Come forth my queen! this.Say( 1042153 ); // Come forth my queen!

View file

@ -222,6 +222,9 @@ namespace Server.Mobiles
public void AddUnholyBone( Mobile target, double chanceToThrow ) public void AddUnholyBone( Mobile target, double chanceToThrow )
{ {
if( this.Map == null )
return;
if ( chanceToThrow >= Utility.RandomDouble() ) if ( chanceToThrow >= Utility.RandomDouble() )
{ {
Direction = GetDirectionTo( target ); Direction = GetDirectionTo( target );

View file

@ -70,6 +70,9 @@ namespace Server.Mobiles
public void DrainLife() public void DrainLife()
{ {
if( this.Map == null )
return;
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 2 ) ) foreach ( Mobile m in this.GetMobilesInRange( 2 ) )

View file

@ -88,6 +88,7 @@ namespace Server.Mobiles
ScaleResistances(); ScaleResistances();
DoCounter( attacker ); DoCounter( attacker );
} }
private void ScaleResistances() private void ScaleResistances()
@ -103,7 +104,7 @@ namespace Server.Mobiles
private void DoCounter( Mobile attacker ) private void DoCounter( Mobile attacker )
{ {
if ( attacker is BaseCreature && ((BaseCreature)attacker).BardProvoked ) if ( this.Map == null && attacker is BaseCreature && ((BaseCreature)attacker).BardProvoked )
return; return;
if ( 0.2 > Utility.RandomDouble() ) if ( 0.2 > Utility.RandomDouble() )