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

tilematrix thread-safety

Browse source 
main waithandle timeout removed
basecreature typo
This commit is contained in:
Mark Sturgill 2013-10-13 22:12:18 -07:00
parent b3831721d9
commit 855b6463ca
5 changed files with 83 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Server/TileMatrixPatch.cs
View file

@ -21,6 +21,7 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
namespace Server
{
@ -46,7 +47,8 @@ namespace Server
{
get
{
return m_LandBlocks;
lock (this)
return m_LandBlocks;
}
}
@ -54,7 +56,8 @@ namespace Server
{
get
{
return m_StaticBlocks;
lock (this)
return m_StaticBlocks;
}
}
@ -77,6 +80,7 @@ namespace Server
m_StaticBlocks = PatchStatics( matrix, staDataPath, staIndexPath, staLookupPath );
}
[MethodImpl(MethodImplOptions.Synchronized)]
private unsafe int PatchLand( TileMatrix matrix, string dataPath, string indexPath )
{
using ( FileStream fsData = new FileStream( dataPath, FileMode.Open, FileAccess.Read, FileShare.Read ) )
@ -116,8 +120,9 @@ namespace Server
}
}
private static StaticTile[] m_TileBuffer = new StaticTile[128];
private StaticTile[] m_TileBuffer = new StaticTile[128];
[MethodImpl(MethodImplOptions.Synchronized)]
private unsafe int PatchStatics( TileMatrix matrix, string dataPath, string indexPath, string lookupPath )
{
using ( FileStream fsData = new FileStream( dataPath, FileMode.Open, FileAccess.Read, FileShare.Read ) )