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

Realized the start event packet after a zoneIn kickevent is weird and malformed, fixed for that usecase. Fixed bug with getting PrivateArea script. Missing area scripts now don't show a message (they were optional). Finished scripting out Limsa opening battle.

Browse Source
This commit is contained in:
Filip Maj 2017-03-19 11:39:21 -04:00
parent 545ce18f1f
commit 77e0639410
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FFXIVClassic Map Server/actors/area/PrivateArea.cs
View File

@ -21,6 +21,7 @@ namespace FFXIVClassic_Map_Server.actors.area
: base(id, parent.zoneName, parent.regionId, className, bgmDay, bgmNight, bgmBattle, parent.isIsolated, parent.isInn, parent.canRideChocobo, parent.canStealth, true) : base(id, parent.zoneName, parent.regionId, className, bgmDay, bgmNight, bgmBattle, parent.isIsolated, parent.isInn, parent.canRideChocobo, parent.canStealth, true)
{ {
this.parentZone = parent; this.parentZone = parent;
this.zoneName = parent.zoneName;
this.privateAreaName = privateAreaName; this.privateAreaName = privateAreaName;
this.privateAreaType = privateAreaType; this.privateAreaType = privateAreaType;
} }

7
FFXIVClassic Map Server/lua/LuaEngine.cs
View File

@ -139,7 +139,7 @@ namespace FFXIVClassic_Map_Server.lua
} }
else if (target is Area) else if (target is Area)
{ {
return String.Format(FILEPATH_ZONE, ((Zone)target).zoneName); return String.Format(FILEPATH_ZONE, ((Area)target).zoneName);
} }
else else
return ""; return "";
@ -288,7 +288,8 @@ namespace FFXIVClassic_Map_Server.lua
} }
else else
{ {
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); if (!(target is Area))
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
} }
} }
@ -467,7 +468,7 @@ namespace FFXIVClassic_Map_Server.lua
//script.Call(script.Globals["onTrigger"], LuaParam.ToArray()); //script.Call(script.Globals["onTrigger"], LuaParam.ToArray());
Coroutine coroutine = script.CreateCoroutine(script.Globals["onTrigger"]).Coroutine; Coroutine coroutine = script.CreateCoroutine(script.Globals["onTrigger"]).Coroutine;
DynValue value = coroutine.Resume(player, LuaParam.ToArray()); DynValue value = coroutine.Resume(LuaParam.ToArray());
GetInstance().ResolveResume(player, coroutine, value); GetInstance().ResolveResume(player, coroutine, value);
return; return;
} }

5
FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs
View File

@ -63,7 +63,10 @@ namespace FFXIVClassic_Map_Server.packets.receive.events
binReader.BaseStream.Seek(0x31, SeekOrigin.Begin); binReader.BaseStream.Seek(0x31, SeekOrigin.Begin);
luaParams = LuaUtils.ReadLuaParams(binReader); if (binReader.PeekChar() == 0x1)
luaParams = new List<LuaParam>();
else
luaParams = LuaUtils.ReadLuaParams(binReader);
} }
catch (Exception){ catch (Exception){
invalidPacket = true; invalidPacket = true;