diff --git a/Scripts/Engines/Harvest/Fishing.cs b/Scripts/Engines/Harvest/Fishing.cs index 19d26b3ae..d8ab5086c 100644 --- a/Scripts/Engines/Harvest/Fishing.cs +++ b/Scripts/Engines/Harvest/Fishing.cs @@ -2,6 +2,7 @@ using System; using Server; using Server.Items; using Server.Mobiles; +using Server.Network; using Server.Engines.Quests; using Server.Engines.Quests.Collector; using System.Collections.Generic; @@ -440,7 +441,7 @@ namespace Server.Engines.Harvest else if ( item is Fish ) { number = 1008124; - name = "a fish"; + name = item.ItemData.Name; } else if ( item is BaseShoes ) { @@ -474,7 +475,12 @@ namespace Server.Engines.Harvest name = item.ItemData.Name; } - if ( number == 1043297 ) + NetState ns = from.NetState; + + if ( ns == null ) + return; + + if ( number == 1043297 || ns.HighSeas ) from.SendLocalizedMessage( number, name ); else from.SendLocalizedMessage( number, true, name ); diff --git a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs index 78af12973..08d4a79ad 100644 --- a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs +++ b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs @@ -293,6 +293,9 @@ namespace Server.Items pet.IsStabled = false; from.Stabled.Remove( pet ); + + if ( from is PlayerMobile ) + ((PlayerMobile)from).AutoStabled.Remove( pet ); } pet.MoveToWorld( from.Location, from.Map ); diff --git a/Scripts/Misc/ClientVerification.cs b/Scripts/Misc/ClientVerification.cs index d6537d064..cce5c5370 100644 --- a/Scripts/Misc/ClientVerification.cs +++ b/Scripts/Misc/ClientVerification.cs @@ -182,7 +182,7 @@ namespace Server.Misc case OldClientResponse.Warn: { state.Mobile.SendMessage( 0x22, "Your client is out of date. Please update your client.", Required ); - state.Mobile.SendMessage( 0x22, "This server reccomends that your client version be at least {0}.", Required ); + state.Mobile.SendMessage( 0x22, "This server recommends that your client version be at least {0}.", Required ); break; } case OldClientResponse.LenientKick: diff --git a/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs b/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs index 9cd096c7f..45f6a7d4d 100644 --- a/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs +++ b/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs @@ -182,7 +182,7 @@ namespace Server.Mobiles m_Trainer.SayTo( from, 1048053 ); // You can't stable that! } } - + private void CloseClaimList( Mobile from ) { from.CloseGump( typeof( ClaimListGump ) ); @@ -220,7 +220,7 @@ namespace Server.Mobiles { if ( pet == null || pet.Deleted || from.Map != this.Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() ) return; - + if ( !from.InRange( this, 14 ) ) { from.SendLocalizedMessage( 500446 ); // That is too far away. @@ -232,6 +232,9 @@ namespace Server.Mobiles DoClaim( from, pet ); from.Stabled.Remove( pet ); + + if ( from is PlayerMobile ) + ((PlayerMobile)from).AutoStabled.Remove( pet ); } else { @@ -245,7 +248,7 @@ namespace Server.Mobiles return; Container bank = from.FindBankNoCreate(); - + if ( ( from.Backpack == null || from.Backpack.GetAmount( typeof( Gold ) ) < 30 ) && ( bank == null || bank.GetAmount( typeof( Gold ) ) < 30 ) ) { SayTo( from, 1042556 ); // Thou dost not have enough gold, not even in thy bank account. @@ -314,7 +317,7 @@ namespace Server.Mobiles pet.IsStabled = true; - if ( Core.SE ) + if ( Core.SE ) pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy from.Stabled.Add( pet ); @@ -340,7 +343,7 @@ namespace Server.Mobiles bool claimed = false; int stabled = 0; - + bool claimByName = ( petName != null ); for ( int i = 0; i < from.Stabled.Count; ++i ) @@ -365,6 +368,10 @@ namespace Server.Mobiles DoClaim( from, pet ); from.Stabled.RemoveAt( i ); + + if ( from is PlayerMobile ) + ((PlayerMobile)from).AutoStabled.Remove( pet ); + --i; claimed = true; @@ -416,16 +423,16 @@ namespace Server.Mobiles if ( !e.Handled && e.HasKeyword( 0x0008 ) ) // *stable* { e.Handled = true; - - CloseClaimList( e.Mobile ); + + CloseClaimList( e.Mobile ); BeginStable( e.Mobile ); } else if ( !e.Handled && e.HasKeyword( 0x0009 ) ) // *claim* { e.Handled = true; - + CloseClaimList( e.Mobile ); - + int index = e.Speech.IndexOf( ' ' ); if ( index != -1 )