diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs index f14e048c..9a8ffaf0 100644 --- a/FFXIVClassic Map Server/PacketProcessor.cs +++ b/FFXIVClassic Map Server/PacketProcessor.cs @@ -54,8 +54,6 @@ namespace FFXIVClassic_Lobby_Server if (packet.header.isCompressed == 0x01) BasePacket.decryptPacket(client.blowfish, ref packet); - // packet.debugPrintPacket(); - List subPackets = packet.getSubpackets(); foreach (SubPacket subpacket in subPackets) { @@ -204,9 +202,9 @@ namespace FFXIVClassic_Lobby_Server LangaugeCodePacket langCode = new LangaugeCodePacket(subpacket.data); player.languageCode = langCode.languageCode; break; - //Unknown + //Unknown - Happens a lot at login, then once every time player zones case 0x0007: - subpacket.debugPrintSubPacket(); + //subpacket.debugPrintSubPacket(); _0x07Packet unknown07 = new _0x07Packet(subpacket.data); break; //Update Position diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs index 1145f418..cbac035a 100644 --- a/FFXIVClassic Map Server/WorldManager.cs +++ b/FFXIVClassic Map Server/WorldManager.cs @@ -459,8 +459,6 @@ namespace FFXIVClassic_Map_Server //Send packets player.sendZoneInPackets(this, 0x1); - player.playerSession.clearInstance(); - player.sendInstanceUpdate(); LuaEngine.onLogin(player); LuaEngine.onZoneIn(player); diff --git a/FFXIVClassic Map Server/actors/area/Area.cs b/FFXIVClassic Map Server/actors/area/Area.cs index 15102ac5..f43ff170 100644 --- a/FFXIVClassic Map Server/actors/area/Area.cs +++ b/FFXIVClassic Map Server/actors/area/Area.cs @@ -88,7 +88,6 @@ namespace FFXIVClassic_Map_Server.Actors subpackets.Add(createStatePacket(playerActorId)); subpackets.Add(createIsZoneingPacket(playerActorId)); subpackets.Add(createScriptBindPacket(playerActorId)); - subpackets[6].debugPrintSubPacket(); return BasePacket.createPacket(subpackets, true, false); } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs index 7e93e1da..1ff3f3b2 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs @@ -64,7 +64,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public bool[] cutsceneFlags = new bool[2432]; - public SubPacket buildPacket(uint playerActorID) + public SubPacket buildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -77,6 +77,17 @@ namespace FFXIVClassic_Map_Server.packets.send.player binWriter.Write(binStream); else Log.error("Failed making SetCutsceneBook packet. Bin Stream was too big!"); + + //Temp Path Companion SNPC Stuff + binWriter.Seek(0x01 ,SeekOrigin.Begin); + binWriter.Write((Int16)2); + binWriter.Write((Byte)0); + binWriter.Write((Int16)sNpcActorIdOffset); + binWriter.Write((Byte)sNpcSkin); + binWriter.Write((Byte)sNpcPersonality); + + binWriter.Seek(0x108, SeekOrigin.Begin); + binWriter.Write(Encoding.ASCII.GetBytes(sNpcName), 0, Encoding.ASCII.GetByteCount(sNpcName) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(sNpcName)); } }