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

Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai

Browse Source
This commit is contained in:
Tahir Akhlaq
2017-07-11 20:52:43 +01:00
parent 7ab40a30f1 372d50d7eb
commit 7c08420206
28 changed files with 294 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.Actors
protected string classPath;
public int boundingGridSize = 50;
public int minX = -1000, minY = -1000, maxX = 1000, maxY = 1000;
public int minX = -5000, minY = -5000, maxX = 5000, maxY = 5000;
protected int numXBlocks, numYBlocks;
protected int halfWidth, halfHeight;
@@ -531,11 +531,11 @@ namespace FFXIVClassic_Map_Server.Actors
}
}
public Director CreateDirector(string path, params object[] args)
public Director CreateDirector(string path, bool hasContentGroup, params object[] args)
{
lock (directorLock)
{
Director director = new Director(directorIdCount, this, path, args);
Director director = new Director(directorIdCount, this, path, hasContentGroup, args);
currentDirectors.Add(director.actorId, director);
directorIdCount++;
return director;

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

@@ -14,7 +14,6 @@ namespace FFXIVClassic_Map_Server.actors.area
class PrivateAreaContent : PrivateArea
{
private Director currentDirector;
private ContentGroup currentContentGroup;
private bool isContentFinished = false;
public static PrivateAreaContent CreateContentArea(String scriptPath)
@@ -26,8 +25,7 @@ namespace FFXIVClassic_Map_Server.actors.area
: base(parent, parent.actorId, classPath, privateAreaName, privateAreaType, 0, 0, 0)
{
currentDirector = director;
currentContentGroup = Server.GetWorldManager().CreateContentGroup(director);
LuaEngine.GetInstance().CallLuaFunction(contentStarter, this, "onCreate", false, currentContentGroup, currentDirector);
LuaEngine.GetInstance().CallLuaFunction(contentStarter, this, "onCreate", false, currentDirector);
}
public Director GetContentDirector()
@@ -35,11 +33,6 @@ namespace FFXIVClassic_Map_Server.actors.area
return currentDirector;
}
public ContentGroup GetContentGroup()
{
return currentContentGroup;
}
public void ContentFinished()
{
isContentFinished = true;

4
FFXIVClassic Map Server/actors/area/Zone.cs
View File

@@ -138,11 +138,11 @@ namespace FFXIVClassic_Map_Server.actors.area
return mActorList[id];
}
public PrivateAreaContent CreateContentArea(Player starterPlayer, string areaClassPath, string contentScript, string areaName, string directorName)
public PrivateAreaContent CreateContentArea(Player starterPlayer, string areaClassPath, string contentScript, string areaName, string directorName, params object[] args)
{
lock (contentAreasLock)
{
Director director = CreateDirector(directorName);
Director director = CreateDirector(directorName, true, args);
if (director == null)
return null;