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

Merge pull request #1 from Ravenwolfe/master

Browse source 
Found issue with XMLserialization using local time to serialize instead ...
This commit is contained in:
Mark Sturgill 2014-04-13 21:16:12 -07:00
commit 3bc81ea952
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Accounting/Account.cs
View file

@ -364,7 +364,7 @@ namespace Server.Accounting
if ( banTime == DateTime.MinValue ) if ( banTime == DateTime.MinValue )
RemoveTag( "BanTime" ); RemoveTag( "BanTime" );
else else
SetTag( "BanTime", XmlConvert.ToString( banTime, XmlDateTimeSerializationMode.Local ) ); SetTag( "BanTime", XmlConvert.ToString( banTime, XmlDateTimeSerializationMode.Utc ) );
if ( banDuration == TimeSpan.Zero ) if ( banDuration == TimeSpan.Zero )
RemoveTag( "BanDuration" ); RemoveTag( "BanDuration" );
@ -1020,11 +1020,11 @@ namespace Server.Accounting
} }
xml.WriteStartElement( "created" ); xml.WriteStartElement( "created" );
xml.WriteString( XmlConvert.ToString( m_Created, XmlDateTimeSerializationMode.Local ) ); xml.WriteString( XmlConvert.ToString( m_Created, XmlDateTimeSerializationMode.Utc ) );
xml.WriteEndElement(); xml.WriteEndElement();
xml.WriteStartElement( "lastLogin" ); xml.WriteStartElement( "lastLogin" );
xml.WriteString( XmlConvert.ToString( m_LastLogin, XmlDateTimeSerializationMode.Local ) ); xml.WriteString( XmlConvert.ToString( m_LastLogin, XmlDateTimeSerializationMode.Utc ) );
xml.WriteEndElement(); xml.WriteEndElement();
xml.WriteStartElement( "totalGameTime" ); xml.WriteStartElement( "totalGameTime" );

2
Scripts/Accounting/AccountComment.cs
View file

@ -67,7 +67,7 @@ namespace Server.Accounting
xml.WriteAttributeString( "addedBy", m_AddedBy ); xml.WriteAttributeString( "addedBy", m_AddedBy );
xml.WriteAttributeString( "lastModified", XmlConvert.ToString( m_LastModified, XmlDateTimeSerializationMode.Local ) ); xml.WriteAttributeString( "lastModified", XmlConvert.ToString( m_LastModified, XmlDateTimeSerializationMode.Utc ) );
xml.WriteString( m_Content ); xml.WriteString( m_Content );

2
Scripts/Engines/Reports/Persistance/PersistanceReader.cs
View file

@ -60,7 +60,7 @@ namespace Server.Engines.Reports
if ( val == null ) if ( val == null )
return DateTime.MinValue; return DateTime.MinValue;
return XmlConvert.ToDateTime( val, XmlDateTimeSerializationMode.Local ); return XmlConvert.ToDateTime( val, XmlDateTimeSerializationMode.Utc );
} }
private bool m_HasChild; private bool m_HasChild;

2
Scripts/Engines/Reports/Persistance/PersistanceWriter.cs
View file

@ -63,7 +63,7 @@ namespace Server.Engines.Reports
public override void SetDateTime( string key, DateTime value ) public override void SetDateTime( string key, DateTime value )
{ {
if ( value != DateTime.MinValue ) if ( value != DateTime.MinValue )
m_Xml.WriteAttributeString( key, XmlConvert.ToString( value, XmlDateTimeSerializationMode.Local ) ); m_Xml.WriteAttributeString( key, XmlConvert.ToString( value, XmlDateTimeSerializationMode.Utc ) );
} }
public override void BeginObject( PersistableType typeID ) public override void BeginObject( PersistableType typeID )

2
Server/Region.cs
View file

@ -1090,7 +1090,7 @@ namespace Server
try try
{ {
value = XmlConvert.ToDateTime( s, XmlDateTimeSerializationMode.Local ); value = XmlConvert.ToDateTime( s, XmlDateTimeSerializationMode.Utc );
} }
catch catch
{ {

2
Server/Utility.cs
View file

@ -541,7 +541,7 @@ namespace Server
{ {
try try
{ {
return XmlConvert.ToDateTime( dateTimeString, XmlDateTimeSerializationMode.Local ); return XmlConvert.ToDateTime( dateTimeString, XmlDateTimeSerializationMode.Utc );
} }
catch catch
{ {