eos fix for pet issue. client ver bug fix. cliloc updates.

This commit is contained in:
xavier 2011-10-02 02:51:09 +00:00
parent 59a5d8e684
commit 4ff574358a
4 changed files with 28 additions and 12 deletions

View file

@ -2,6 +2,7 @@ using System;
using Server; using Server;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
using Server.Network;
using Server.Engines.Quests; using Server.Engines.Quests;
using Server.Engines.Quests.Collector; using Server.Engines.Quests.Collector;
using System.Collections.Generic; using System.Collections.Generic;
@ -440,7 +441,7 @@ namespace Server.Engines.Harvest
else if ( item is Fish ) else if ( item is Fish )
{ {
number = 1008124; number = 1008124;
name = "a fish"; name = item.ItemData.Name;
} }
else if ( item is BaseShoes ) else if ( item is BaseShoes )
{ {
@ -474,7 +475,12 @@ namespace Server.Engines.Harvest
name = item.ItemData.Name; name = item.ItemData.Name;
} }
if ( number == 1043297 ) NetState ns = from.NetState;
if ( ns == null )
return;
if ( number == 1043297 || ns.HighSeas )
from.SendLocalizedMessage( number, name ); from.SendLocalizedMessage( number, name );
else else
from.SendLocalizedMessage( number, true, name ); from.SendLocalizedMessage( number, true, name );

View file

@ -293,6 +293,9 @@ namespace Server.Items
pet.IsStabled = false; pet.IsStabled = false;
from.Stabled.Remove( pet ); from.Stabled.Remove( pet );
if ( from is PlayerMobile )
((PlayerMobile)from).AutoStabled.Remove( pet );
} }
pet.MoveToWorld( from.Location, from.Map ); pet.MoveToWorld( from.Location, from.Map );

View file

@ -182,7 +182,7 @@ namespace Server.Misc
case OldClientResponse.Warn: case OldClientResponse.Warn:
{ {
state.Mobile.SendMessage( 0x22, "Your client is out of date. Please update your client.", Required ); 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; break;
} }
case OldClientResponse.LenientKick: case OldClientResponse.LenientKick:

View file

@ -232,6 +232,9 @@ namespace Server.Mobiles
DoClaim( from, pet ); DoClaim( from, pet );
from.Stabled.Remove( pet ); from.Stabled.Remove( pet );
if ( from is PlayerMobile )
((PlayerMobile)from).AutoStabled.Remove( pet );
} }
else else
{ {
@ -365,6 +368,10 @@ namespace Server.Mobiles
DoClaim( from, pet ); DoClaim( from, pet );
from.Stabled.RemoveAt( i ); from.Stabled.RemoveAt( i );
if ( from is PlayerMobile )
((PlayerMobile)from).AutoStabled.Remove( pet );
--i; --i;
claimed = true; claimed = true;