warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Hotfix for pet removal SVN 501 patch

Browse source 
(http://www.runuo.com/forums/server-support-windows/101296-svn-503-stabled-pets-disappearing.html)
(http://www.uodemise.com/discussion/showthread.php?t=141863)
This commit is contained in:
daedalus 2010-03-20 13:14:31 +00:00
parent f20b1af778
commit 42d5433ded
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Scripts/Mobiles/AI/Creature/BaseCreature.cs
View file

@ -250,10 +250,16 @@ namespace Server.Mobiles
public virtual InhumanSpeech SpeechType{ get{ return null; } }
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public bool IsStabled
{
get{ return m_IsStabled; }
set{ m_IsStabled = value; }
set
{
m_IsStabled = value;
if ( m_IsStabled )
StopDeleteTimer();
}
}
[CommandProperty( AccessLevel.GameMaster )]
@ -363,12 +369,23 @@ namespace Server.Mobiles
public void BeginDeleteTimer()
{
if ( !(this is BaseEscortable) && !Summoned && !Deleted )
if ( !(this is BaseEscortable) && !Summoned && !Deleted && !IsStabled )
{
StopDeleteTimer();
m_DeleteTimer = new DeleteTimer( this, TimeSpan.FromDays( 3.0 ) );
m_DeleteTimer.Start();
}
}
public void StopDeleteTimer()
{
if ( m_DeleteTimer != null )
{
m_DeleteTimer.Stop();
m_DeleteTimer = null;
}
}
#endregion
public virtual double WeaponAbilityChance{ get{ return 0.4; } }
@ -1620,7 +1637,10 @@ namespace Server.Mobiles
writer.Write( (int)m_RemoveStep );
// Version 17
writer.Write( DeleteTimeLeft );
if ( IsStabled || ( Controlled && ControlMaster != null ) )
writer.Write( TimeSpan.Zero );
else
writer.Write( DeleteTimeLeft );
}
private static double[] m_StandardActiveSpeeds = new double[]
@ -2442,6 +2462,8 @@ namespace Server.Mobiles
RemoveFollowers();
m_ControlMaster = value;
AddFollowers();
if ( m_ControlMaster != null )
StopDeleteTimer();
Delta( MobileDelta.Noto );
}