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

Cleaned up some warnings.

Browse Source
This commit is contained in:
Filip Maj
2019-05-04 20:53:08 -04:00
parent 1e4a1cf263
commit 10017b7e8c
27 changed files with 68 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,20 +2,13 @@
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.actors.area;
using FFXIVClassic_Map_Server.actors.chara.npc;
using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.dataobjects.chara;
using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor;
using MoonSharp.Interpreter;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FFXIVClassic_Map_Server.packets.send;
using FFXIVClassic_Map_Server.actors.group;
using FFXIVClassic_Map_Server.actors.director;
using FFXIVClassic_Map_Server.actors.chara.ai.controllers;
namespace FFXIVClassic_Map_Server.Actors
{
@@ -388,35 +381,35 @@ namespace FFXIVClassic_Map_Server.Actors
}
}
// todo: for zones override this to search contentareas (assuming flag is passed)
// todo: for zones override this to search 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>());
actorList.AddRange(mActorList.Values.OfType<T>());
return actorList;
}
}
public int GetActorCount()
{
lock (mActorList)
{
return mActorList.Count;
}
}
}
public virtual List<Actor> GetAllActors()
{
return GetAllActors<Actor>();
}
public virtual List<Player> GetPlayers()
{
return GetAllActors<Player>();
}
}
public virtual List<BattleNpc> GetMonsters()
{
return GetAllActors<BattleNpc>();
@@ -425,8 +418,8 @@ namespace FFXIVClassic_Map_Server.Actors
public virtual List<Ally> GetAllies()
{
return GetAllActors<Ally>();
}
}
public void BroadcastPacketsAroundActor(Actor actor, List<SubPacket> packets)
{
foreach (SubPacket packet in packets)
@@ -669,13 +662,13 @@ namespace FFXIVClassic_Map_Server.Actors
lock (mActorList)
{
foreach (Actor a in mActorList.Values.ToList())
a.Update(tick);
a.Update(tick);
if ((tick - lastUpdateScript).TotalMilliseconds > 1500)
{
//LuaEngine.GetInstance().CallLuaFunctionForReturn(LuaEngine.GetScriptPath(this), "onUpdate", true, this, tick);
lastUpdateScript = tick;
}
}
}
}