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

Implement Core.TickCount

Browse source 
Convert movement, actions (lift/use), combat, and spells to use Core.TickCount and avoid DateTime caveats (performance, system time dependency, etc)
Refactor DateTime.Now to DateTime.UtcNow
Add LOS check for Iron Maiden addon
This commit is contained in:
Mark Sturgill 2013-10-06 03:21:18 -07:00
parent f99eefb288
commit d2c670f5c3
241 changed files with 842 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Scripts/Multis/BaseHouse.cs
View file

@ -47,7 +47,7 @@ namespace Server.Multis
m_CurrentStage = level;
if ( DynamicDecay.Decays( level ) )
m_NextDecayStage = DateTime.Now + DynamicDecay.GetRandomDuration( level );
m_NextDecayStage = DateTime.UtcNow + DynamicDecay.GetRandomDuration( level );
else
m_NextDecayStage = DateTime.MinValue;
}
@ -171,14 +171,14 @@ namespace Server.Multis
if ( DynamicDecay.Enabled )
ResetDynamicDecay();
m_LastRefreshed = DateTime.Now;
m_LastRefreshed = DateTime.UtcNow;
result = DecayLevel.Ageless;
}
else if ( DynamicDecay.Enabled )
{
DecayLevel stage = m_CurrentStage;
if ( stage == DecayLevel.Ageless || ( DynamicDecay.Decays( stage ) && m_NextDecayStage <= DateTime.Now ) )
if ( stage == DecayLevel.Ageless || ( DynamicDecay.Decays( stage ) && m_NextDecayStage <= DateTime.UtcNow ) )
SetDynamicDecay( ++stage );
if ( stage == DecayLevel.Collapsed && ( HasRentedVendors || VendorInventories.Count > 0 ) )
@ -205,7 +205,7 @@ namespace Server.Multis
public DecayLevel GetOldDecayLevel()
{
TimeSpan timeAfterRefresh = DateTime.Now - m_LastRefreshed;
TimeSpan timeAfterRefresh = DateTime.UtcNow - m_LastRefreshed;
int percent = (int) ((timeAfterRefresh.Ticks * 1000) / DecayPeriod.Ticks);
if ( percent >= 1000 ) // 100.0%
@ -231,7 +231,7 @@ namespace Server.Multis
DecayLevel oldLevel = this.DecayLevel;
m_LastRefreshed = DateTime.Now;
m_LastRefreshed = DateTime.UtcNow;
if ( DynamicDecay.Enabled )
ResetDynamicDecay();
@ -1217,9 +1217,9 @@ namespace Server.Multis
{
m_AllHouses.Add( this );
m_LastRefreshed = DateTime.Now;
m_LastRefreshed = DateTime.UtcNow;
m_BuiltOn = DateTime.Now;
m_BuiltOn = DateTime.UtcNow;
m_LastTraded = DateTime.MinValue;
m_Doors = new ArrayList();
@ -1763,7 +1763,7 @@ namespace Server.Multis
m_House.Friends.Clear();
m_House.CoOwners.Clear();
m_House.ChangeLocks( to );
m_House.LastTraded = DateTime.Now;
m_House.LastTraded = DateTime.UtcNow;
}
}
@ -2020,7 +2020,7 @@ namespace Server.Multis
Guild attackerGuild = m.Guild as Guild;
Guild defenderGuild = info.Defender.Guild as Guild;
if ( info.Defender.Player && info.Defender.Alive && (DateTime.Now - info.LastCombatTime) < HouseRegion.CombatHeatDelay && (attackerGuild == null || defenderGuild == null || defenderGuild != attackerGuild && !defenderGuild.IsEnemy( attackerGuild )) )
if ( info.Defender.Player && info.Defender.Alive && (DateTime.UtcNow - info.LastCombatTime) < HouseRegion.CombatHeatDelay && (attackerGuild == null || defenderGuild == null || defenderGuild != attackerGuild && !defenderGuild.IsEnemy( attackerGuild )) )
return true;
}
@ -2506,7 +2506,7 @@ namespace Server.Multis
{
Item child = children[j];
if ( child.Decays && !child.IsLockedDown && !child.IsSecure && (child.LastMoved + child.DecayTime) <= DateTime.Now )
if ( child.Decays && !child.IsLockedDown && !child.IsSecure && (child.LastMoved + child.DecayTime) <= DateTime.UtcNow )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( child.Delete ) );
}
}
@ -2728,7 +2728,7 @@ namespace Server.Multis
}
if ( version < 11 )
m_LastRefreshed = DateTime.Now + TimeSpan.FromHours( 24 * Utility.RandomDouble() );
m_LastRefreshed = DateTime.UtcNow + TimeSpan.FromHours( 24 * Utility.RandomDouble() );
if ( DynamicDecay.Enabled && !loadedDynamicDecay )
{

16
Scripts/Multis/Boats/BaseBoat.cs
View file

@ -114,19 +114,19 @@ namespace Server.Multis
{
DateTime start = TimeOfDecay - BoatDecayDelay;
if ( DateTime.Now - start < TimeSpan.FromHours( 1.0 ) )
if ( DateTime.UtcNow - start < TimeSpan.FromHours( 1.0 ) )
return 1043010; // This structure is like new.
if ( DateTime.Now - start < TimeSpan.FromDays( 2.0 ) )
if ( DateTime.UtcNow - start < TimeSpan.FromDays( 2.0 ) )
return 1043011; // This structure is slightly worn.
if ( DateTime.Now - start < TimeSpan.FromDays( 3.0 ) )
if ( DateTime.UtcNow - start < TimeSpan.FromDays( 3.0 ) )
return 1043012; // This structure is somewhat worn.
if ( DateTime.Now - start < TimeSpan.FromDays( 4.0 ) )
if ( DateTime.UtcNow - start < TimeSpan.FromDays( 4.0 ) )
return 1043013; // This structure is fairly worn.
if ( DateTime.Now - start < TimeSpan.FromDays( 5.0 ) )
if ( DateTime.UtcNow - start < TimeSpan.FromDays( 5.0 ) )
return 1043014; // This structure is greatly worn.
return 1043015; // This structure is in danger of collapsing.
@ -152,7 +152,7 @@ namespace Server.Multis
public BaseBoat() : base( 0x0 )
{
m_DecayTime = DateTime.Now + BoatDecayDelay;
m_DecayTime = DateTime.UtcNow + BoatDecayDelay;
m_TillerMan = new TillerMan( this );
m_Hold = new Hold( this );
@ -465,7 +465,7 @@ namespace Server.Multis
public void Refresh()
{
m_DecayTime = DateTime.Now + BoatDecayDelay;
m_DecayTime = DateTime.UtcNow + BoatDecayDelay;
if( m_TillerMan != null )
m_TillerMan.InvalidateProperties();
@ -507,7 +507,7 @@ namespace Server.Multis
if ( m_Decaying )
return true;
if ( !IsMoving && DateTime.Now >= m_DecayTime )
if ( !IsMoving && DateTime.UtcNow >= m_DecayTime )
{
new DecayTimer( this ).Start();

2
Scripts/Multis/Camps/BaseCamp.cs
View file

@ -61,7 +61,7 @@ namespace Server.Multis
m_DecayTimer.Stop();
if ( setDecayTime )
m_DecayTime = DateTime.Now + DecayDelay;
m_DecayTime = DateTime.UtcNow + DecayDelay;
m_DecayTimer = Timer.DelayCall( DecayDelay, new TimerCallback( Delete ) );
}

2
Scripts/Multis/HouseSign.cs
View file

@ -165,7 +165,7 @@ namespace Server.Multis
if ( canClaim && !BaseHouse.HasAccountHouse( from ) )
{
m_Owner.Owner = from;
m_Owner.LastTraded = DateTime.Now;
m_Owner.LastTraded = DateTime.UtcNow;
}
}