diff --git a/FFXIVClassic Map Server/actors/area/PrivateArea.cs b/FFXIVClassic Map Server/actors/area/PrivateArea.cs index 87080fa6..fee2e52d 100644 --- a/FFXIVClassic Map Server/actors/area/PrivateArea.cs +++ b/FFXIVClassic Map Server/actors/area/PrivateArea.cs @@ -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) { this.parentZone = parent; + this.zoneName = parent.zoneName; this.privateAreaName = privateAreaName; this.privateAreaType = privateAreaType; } diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index 498a4b62..bfd955ee 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -139,7 +139,7 @@ namespace FFXIVClassic_Map_Server.lua } else if (target is Area) { - return String.Format(FILEPATH_ZONE, ((Zone)target).zoneName); + return String.Format(FILEPATH_ZONE, ((Area)target).zoneName); } else return ""; @@ -288,7 +288,8 @@ namespace FFXIVClassic_Map_Server.lua } 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()); 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); return; } diff --git a/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs b/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs index 34daa640..f5085c9e 100644 --- a/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs +++ b/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs @@ -63,7 +63,10 @@ namespace FFXIVClassic_Map_Server.packets.receive.events binReader.BaseStream.Seek(0x31, SeekOrigin.Begin); - luaParams = LuaUtils.ReadLuaParams(binReader); + if (binReader.PeekChar() == 0x1) + luaParams = new List(); + else + luaParams = LuaUtils.ReadLuaParams(binReader); } catch (Exception){ invalidPacket = true;