cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

160
FFXIVClassic Map Server/actors/area/Area.cs
View File

@@ -113,51 +113,54 @@ namespace FFXIVClassic_Map_Server.Actors
{
if (!mActorList.ContainsKey(actor.actorId))
mActorList.Add(actor.actorId, actor);
int gridX = (int)actor.positionX / boundingGridSize;
int gridY = (int)actor.positionZ / boundingGridSize;
gridX += halfWidth;
gridY += halfHeight;
//Boundries
if (gridX < 0)
gridX = 0;
if (gridX >= numXBlocks)
gridX = numXBlocks - 1;
if (gridY < 0)
gridY = 0;
if (gridY >= numYBlocks)
gridY = numYBlocks - 1;
lock (mActorBlock)
mActorBlock[gridX, gridY].Add(actor);
}
int gridX = (int)actor.positionX / boundingGridSize;
int gridY = (int)actor.positionZ / boundingGridSize;
gridX += halfWidth;
gridY += halfHeight;
//Boundries
if (gridX < 0)
gridX = 0;
if (gridX >= numXBlocks)
gridX = numXBlocks - 1;
if (gridY < 0)
gridY = 0;
if (gridY >= numYBlocks)
gridY = numYBlocks - 1;
lock (mActorBlock)
mActorBlock[gridX, gridY].Add(actor);
}
public void RemoveActorFromZone(Actor actor)
{
lock (mActorList)
{
mActorList.Remove(actor.actorId);
int gridX = (int)actor.positionX / boundingGridSize;
int gridY = (int)actor.positionZ / boundingGridSize;
int gridX = (int)actor.positionX / boundingGridSize;
int gridY = (int)actor.positionZ / boundingGridSize;
gridX += halfWidth;
gridY += halfHeight;
gridX += halfWidth;
gridY += halfHeight;
//Boundries
if (gridX < 0)
gridX = 0;
if (gridX >= numXBlocks)
gridX = numXBlocks - 1;
if (gridY < 0)
gridY = 0;
if (gridY >= numYBlocks)
gridY = numYBlocks - 1;
//Boundries
if (gridX < 0)
gridX = 0;
if (gridX >= numXBlocks)
gridX = numXBlocks - 1;
if (gridY < 0)
gridY = 0;
if (gridY >= numYBlocks)
gridY = numYBlocks - 1;
lock (mActorBlock)
mActorBlock[gridX, gridY].Remove(actor);
lock (mActorBlock)
mActorBlock[gridX, gridY].Remove(actor);
}
}
public void UpdateActorPosition(Actor actor)
@@ -421,75 +424,84 @@ namespace FFXIVClassic_Map_Server.Actors
public void SpawnActor(SpawnLocation location)
{
ActorClass actorClass = Server.GetWorldManager().GetActorClass(location.classId);
if (actorClass == null)
return;
lock (mActorList)
{
ActorClass actorClass = Server.GetWorldManager().GetActorClass(location.classId);
uint zoneId;
if (actorClass == null)
return;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
else
zoneId = actorId;
uint zoneId;
Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, location.state, location.animId, null);
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
else
zoneId = actorId;
Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, location.state, location.animId, null);
npc.LoadEventConditions(actorClass.eventConditions);
npc.LoadEventConditions(actorClass.eventConditions);
AddActorToZone(npc);
AddActorToZone(npc);
}
}
public Npc SpawnActor(uint classId, string uniqueId, float x, float y, float z, float rot = 0, ushort state = 0, uint animId = 0, bool isMob = true)
{
ActorClass actorClass = Server.GetWorldManager().GetActorClass(classId);
lock (mActorList)
{
ActorClass actorClass = Server.GetWorldManager().GetActorClass(classId);
if (actorClass == null)
return null;
if (actorClass == null)
return null;
uint zoneId;
uint zoneId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
else
zoneId = actorId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
else
zoneId = actorId;
Npc npc;
Npc npc;
if(isMob)
npc = new BattleNpc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, rot, state, animId, null);
else
npc = new Npc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, rot, state, animId, null);
if (isMob)
npc = new BattleNpc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, rot, state, animId, null);
else
npc = new Npc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, rot, state, animId, null);
npc.LoadEventConditions(actorClass.eventConditions);
npc.LoadEventConditions(actorClass.eventConditions);
AddActorToZone(npc);
AddActorToZone(npc);
return npc;
return npc;
}
}
public Npc SpawnActor(uint classId, string uniqueId, float x, float y, float z, uint regionId, uint layoutId)
{
ActorClass actorClass = Server.GetWorldManager().GetActorClass(classId);
lock (mActorList)
{
ActorClass actorClass = Server.GetWorldManager().GetActorClass(classId);
if (actorClass == null)
return null;
if (actorClass == null)
return null;
uint zoneId;
uint zoneId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
else
zoneId = actorId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
else
zoneId = actorId;
Npc npc = new Npc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, 0, regionId, layoutId);
Npc npc = new Npc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, 0, regionId, layoutId);
npc.LoadEventConditions(actorClass.eventConditions);
npc.LoadEventConditions(actorClass.eventConditions);
AddActorToZone(npc);
AddActorToZone(npc);
return npc;
return npc;
}
}
public void DespawnActor(string uniqueId)

19
FFXIVClassic Map Server/actors/area/PrivateAreaContent.cs
View File

@@ -40,17 +40,20 @@ namespace FFXIVClassic_Map_Server.actors.area
public void CheckDestroy()
{
if (isContentFinished)
lock (mActorList)
{
bool noPlayersLeft = true;
foreach (Actor a in mActorList.Values)
if (isContentFinished)
{
if (a is Player)
noPlayersLeft = false;
bool noPlayersLeft = true;
foreach (Actor a in mActorList.Values)
{
if (a is Player)
noPlayersLeft = false;
}
if (noPlayersLeft)
GetParentZone().DeleteContentArea(this);
}
if (noPlayersLeft)
GetParentZone().DeleteContentArea(this);
}
}
}
}

21
FFXIVClassic Map Server/actors/area/Zone.cs
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)