add some more locks, fixed typo in AddHP, add missing ability

This commit is contained in:
Tahir Akhlaq
2017-08-23 03:08:43 +01:00
parent c79b5c9992
commit 54af893570
8 changed files with 146 additions and 111 deletions

View File

@@ -119,21 +119,24 @@ namespace FFXIVClassic_Map_Server.actors.area
public Actor FindActorInZone(uint id)
{
if (!mActorList.ContainsKey(id))
lock (mActorList)
{
foreach(Dictionary<uint, PrivateArea> paList in privateAreas.Values)
if (!mActorList.ContainsKey(id))
{
foreach(PrivateArea pa in paList.Values)
foreach (Dictionary<uint, PrivateArea> paList in privateAreas.Values)
{
Actor actor = pa.FindActorInArea(id);
if (actor != null)
return actor;
foreach (PrivateArea pa in paList.Values)
{
Actor actor = pa.FindActorInArea(id);
if (actor != null)
return actor;
}
}
return null;
}
return null;
else
return mActorList[id];
}
else
return mActorList[id];
}
public PrivateAreaContent CreateContentArea(Player starterPlayer, string areaClassPath, string contentScript, string areaName, string directorName, params object[] args)