This commit is contained in:
parent
ea0e037770
commit
96a37544fd
17 changed files with 211 additions and 163 deletions
|
|
@ -100,7 +100,7 @@ namespace Server.Items
|
|||
public int MaxItems
|
||||
{
|
||||
get{ return ( m_MaxItems == -1 ? DefaultMaxItems : m_MaxItems ); }
|
||||
set{ m_MaxItems = value; }
|
||||
set{ m_MaxItems = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
|
|
|
|||
|
|
@ -1245,7 +1245,16 @@ namespace Server
|
|||
{
|
||||
if ( m_Enumerator.MoveNext() )
|
||||
{
|
||||
object o = m_Enumerator.Current;
|
||||
object o;
|
||||
|
||||
try
|
||||
{
|
||||
o = m_Enumerator.Current;
|
||||
}
|
||||
catch
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( o is Mobile )
|
||||
{
|
||||
|
|
@ -1503,7 +1512,16 @@ namespace Server
|
|||
{
|
||||
if ( m_Enumerator.MoveNext() )
|
||||
{
|
||||
object o = m_Enumerator.Current;
|
||||
object o;
|
||||
|
||||
try
|
||||
{
|
||||
o = m_Enumerator.Current;
|
||||
}
|
||||
catch
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( o is Mobile )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -774,8 +774,8 @@ namespace Server
|
|||
|
||||
#endregion
|
||||
|
||||
private static TimeSpan WarmodeSpamCatch = TimeSpan.FromSeconds( 0.5 );
|
||||
private static TimeSpan WarmodeSpamDelay = TimeSpan.FromSeconds( 2.0 );
|
||||
private static readonly TimeSpan WarmodeSpamCatch = TimeSpan.FromSeconds( (Core.SE ? 1.0 : 0.5) );
|
||||
private static readonly TimeSpan WarmodeSpamDelay = TimeSpan.FromSeconds( (Core.SE ? 4.0 : 2.0) );
|
||||
private const int WarmodeCatchCount = 4; // Allow four warmode changes in 0.5 seconds, any more will be delay for two seconds
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
|
|
@ -1182,7 +1182,7 @@ namespace Server
|
|||
UpdateAggrExpire();
|
||||
}
|
||||
|
||||
public List<Mobile> Stabled { get { return m_Stabled; } set { m_Stabled = value; } }
|
||||
public List<Mobile> Stabled { get { return m_Stabled; } }
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )]
|
||||
public VirtueInfo Virtues { get { return m_Virtues; } set { } }
|
||||
|
|
|
|||
|
|
@ -113,8 +113,8 @@ namespace Server
|
|||
if ( ns != null )
|
||||
ns.RemoveTrade( this );
|
||||
|
||||
m_From.Container.Delete();
|
||||
m_To.Container.Delete();
|
||||
Timer.DelayCall( TimeSpan.Zero, delegate{ m_From.Container.Delete(); } );
|
||||
Timer.DelayCall( TimeSpan.Zero, delegate{ m_To.Container.Delete(); } );
|
||||
}
|
||||
|
||||
public void Update()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue