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

Browse source
This commit is contained in:
asayre 2010-10-16 19:26:26 +00:00
parent c62db2c9b6
commit a62fbec243
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Server/Main.cs
View file

@ -103,13 +103,13 @@ namespace Server
internal static bool VBdotNet { get { return m_VBdotNET; } }
public static List<string> DataDirectories { get { return m_DataDirectories; } }
public static Assembly Assembly { get { return m_Assembly; } set { m_Assembly = value; } }
public static Version Version { get { return m_Assembly.GetName().Version; } }
public static Version Version { get { return m_Assembly.GetName().Version; } }
public static Process Process { get { return m_Process; } }
public static Thread Thread { get { return m_Thread; } }
public static MultiTextWriter MultiConsoleOut { get { return m_MultiConOut; } }
public static readonly bool Is64Bit = (IntPtr.Size == 8);
//TODO: Upon public release of .NET 4.0, use Environment.Is64BitOperatingSystem/Process
//TODO: Upon public release of .NET 4.0, use Environment.Is64BitOperatingSystem/Process
private static bool m_MultiProcessor;
private static int m_ProcessorCount;
@ -457,8 +457,8 @@ namespace Server
SetConsoleCtrlHandler( m_ConsoleEventHandler, true );
}
if ( GCSettings.IsServerGC )
Console.WriteLine("Core: Server garbage collection mode enabled");
if ( GCSettings.IsServerGC )
Console.WriteLine("Core: Server garbage collection mode enabled");
while( !ScriptCompiler.Compile( m_Debug, m_Cache ) )
{
@ -651,7 +651,7 @@ namespace Server
}
catch
{
Console.WriteLine( "Warning: Exception in serialization verification of type {0}", t );
Console.WriteLine( "Warning: Exception in serialization verification of type {0}", t );
}
}
}

6
Server/Mobile.cs
View file

@ -8041,10 +8041,10 @@ namespace Server
{
if( item.Parent is Item )
{
Item parent = item.Parent as Item;
Item parent = item.Parent as Item;
if ( !(CanSee( parent ) && parent.IsChildVisibleTo( this, item )) )
return false;
if ( !(CanSee( parent ) && parent.IsChildVisibleTo( this, item )) )
return false;
}
else if( item.Parent is Mobile )
{