zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-08-24 18:10:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixing more merge errors. I'm bad at this

Browse source
This commit is contained in:
yogurt 2017-07-11 09:50:54 -05:00
parent 86a2e4aff3
commit 4dee26e136
2 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
FFXIVClassic Map Server/actors/area/Area.cs
View file

@ -376,38 +376,23 @@ namespace FFXIVClassic_Map_Server.Actors
}
}
// todo: for zones override this to seach contentareas (assuming flag is passed)
<<<<<<< HEAD
public virtual List<Actor> GetAllActors()
{
lock (mActorList)
{
List<Actor> actorList = new List<Actor>(mActorList.Count);
foreach (var actor in mActorList.Values)
{
actorList.Add(actor);
}
=======
// todo: for zones override this to seach contentareas (assuming flag is passed)
public virtual List<T> GetAllActors<T>() where T : Actor
{
lock (mActorList)
{
List<T> actorList = new List<T>(mActorList.Count);
actorList.AddRange(mActorList.Values.OfType<T>());
>>>>>>> 84d5eee1fcc284d252b7953a70aebed60b195ee8
actorList.AddRange(mActorList.Values.OfType<T>());
return actorList;
}
}
<<<<<<< HEAD
=======
public virtual List<Actor> GetAllActors()
{
return GetAllActors<Actor>();
}
>>>>>>> 84d5eee1fcc284d252b7953a70aebed60b195ee8
public void BroadcastPacketsAroundActor(Actor actor, List<SubPacket> packets)
{
foreach (SubPacket packet in packets)