diff --git a/Scripts/Items/Misc/Bola.cs b/Scripts/Items/Misc/Bola.cs index 16190d33c..9f42dde1c 100644 --- a/Scripts/Items/Misc/Bola.cs +++ b/Scripts/Items/Misc/Bola.cs @@ -102,7 +102,7 @@ namespace Server.Items to.SendLocalizedMessage(1040023); // You have been knocked off of your mount! } - (to as PlayerMobile).SetMountBlock(BlockMountType.Dazed, TimeSpan.FromSeconds(10), true); + (to as PlayerMobile).SetMountBlock(BlockMountType.Dazed, TimeSpan.FromSeconds( Core.ML ? 10 : 3 ), true); } else { @@ -111,7 +111,7 @@ namespace Server.Items if (Core.AOS && from is PlayerMobile) /* only failsafe, attacker should already be dismounted */ { - (from as PlayerMobile).SetMountBlock( BlockMountType.BolaRecovery, TimeSpan.FromSeconds(10), true ); + (from as PlayerMobile).SetMountBlock( BlockMountType.BolaRecovery, TimeSpan.FromSeconds( Core.ML ? 10 : 3 ), true ); } to.Damage(1); diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index ce656077f..48c5f2bf2 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -5420,20 +5420,24 @@ namespace Server.Mobiles } } - if( ReturnsToHome && this.IsSpawnerBound() ) + if (ReturnsToHome && this.IsSpawnerBound() && !this.InRange(Home, RangeHome) ) { - if( ( Combatant == null ) && ( Warmode == false ) && Utility.RandomDouble() < .10 ) /* some throttling */ + if ((Combatant == null) && (Warmode == false) && Utility.RandomDouble() < .10) /* some throttling */ { - m_FailedReturnHome = !this.Move( GetDirectionTo( Home.X, Home.Y ) ) ? m_FailedReturnHome + 1 : 0; + m_FailedReturnHome = !this.Move(GetDirectionTo(Home.X, Home.Y)) ? m_FailedReturnHome + 1 : 0; - if( m_FailedReturnHome > 5 ) + if (m_FailedReturnHome > 5) { - this.SetLocation( this.Home, true ); + this.SetLocation(this.Home, true); m_FailedReturnHome = 0; } } } + else + { + m_FailedReturnHome = 0; + } if ( HasAura && DateTime.Now >= m_NextAura ) {