From 7036ef363d11d60a018bad0a39fe593fc01f8ba6 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 18 Dec 2016 09:50:23 -0500 Subject: [PATCH] Implemented MotD. Groups are now sent from world server to client, and also initialized. Retainers finished and are also sent. --- FFXIVClassic Map Server/PacketProcessor.cs | 12 +- .../actors/chara/player/Player.cs | 9 -- .../Actor/Group/Work/LinkshellWork.cs | 8 +- .../Actor/Group/Work/RetainerWork.cs | 6 + .../DataObjects/Group/Group.cs | 2 +- .../DataObjects/Group/Linkshell.cs | 28 ++--- .../DataObjects/Group/Party.cs | 1 + .../DataObjects/Group/RetainerGroup.cs | 34 ++++-- .../DataObjects/Group/RetainerGroupMember.cs | 18 ++- FFXIVClassic World Server/Database.cs | 112 ++++++++++++++++-- .../FFXIVClassic World Server.csproj | 1 + FFXIVClassic World Server/LinkshellManager.cs | 24 +++- FFXIVClassic World Server/PacketProcessor.cs | 24 +++- .../Send/Subpackets/SendMessagePacket.cs | 58 +++++++++ .../Receive/Group/ModifyLinkshellPacket.cs | 2 + .../RetainerGroupManager.cs | 6 +- FFXIVClassic World Server/Server.cs | 15 +-- FFXIVClassic World Server/WorldMaster.cs | 23 +++- 18 files changed, 309 insertions(+), 74 deletions(-) create mode 100644 FFXIVClassic World Server/Packets/Send/Subpackets/SendMessagePacket.cs diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs index e89968ac..d55dc078 100644 --- a/FFXIVClassic Map Server/PacketProcessor.cs +++ b/FFXIVClassic Map Server/PacketProcessor.cs @@ -90,13 +90,7 @@ namespace FFXIVClassic_Map_Server case 0x0002: subpacket.DebugPrintSubPacket(); - session = mServer.AddSession(subpacket.header.targetId); client.QueuePacket(_0x2Packet.BuildPacket(session.id), true, false); - - LuaEngine.OnBeginLogin(session.GetActor()); - Server.GetWorldManager().DoZoneIn(session.GetActor(), true, 0x1); - LuaEngine.OnLogin(session.GetActor()); - client.FlushQueuedSendPackets(); break; @@ -115,9 +109,13 @@ namespace FFXIVClassic_Map_Server session.GetActor().BroadcastPacket(SendMessagePacket.BuildPacket(session.id, session.id, chatMessage.logType, session.GetActor().customDisplayName, chatMessage.message), false); break; - //Langauge Code + //Langauge Code (Client safe to send packets to now) case 0x0006: LangaugeCodePacket langCode = new LangaugeCodePacket(subpacket.data); + session = mServer.AddSession(subpacket.header.targetId); + LuaEngine.OnBeginLogin(session.GetActor()); + Server.GetWorldManager().DoZoneIn(session.GetActor(), true, 0x1); + LuaEngine.OnLogin(session.GetActor()); session.languageCode = langCode.languageCode; break; //Unknown - Happens a lot at login, then once every time player zones diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 6735ccfa..69062109 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -484,15 +484,6 @@ namespace FFXIVClassic_Map_Server.Actors QueuePacket(GetSpawnPackets(actorId, spawnType)); //GetSpawnPackets(actorId, spawnType).DebugPrintPacket(); - #region Groups - RetainerGroup retainerGroup = new RetainerGroup(0x800000000004e639); - PartyGroup partyGroup = new PartyGroup(0x8000000000696df2, actorId); - retainerGroup.add(this); - partyGroup.add(this); - retainerGroup.sendMemberPackets(this); - partyGroup.sendMemberPackets(this); - #endregion - #region Inventory & Equipment QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId)); inventories[Inventory.NORMAL].SendFullInventory(); diff --git a/FFXIVClassic World Server/Actor/Group/Work/LinkshellWork.cs b/FFXIVClassic World Server/Actor/Group/Work/LinkshellWork.cs index 9fca2ab7..9d58eb4e 100644 --- a/FFXIVClassic World Server/Actor/Group/Work/LinkshellWork.cs +++ b/FFXIVClassic World Server/Actor/Group/Work/LinkshellWork.cs @@ -9,6 +9,12 @@ namespace FFXIVClassic_World_Server.Actor.Group.Work class LinkshellWork { public GroupGlobalSave _globalSave = new GroupGlobalSave(); - public GroupMemberSave[] _memberSave = new GroupMemberSave[128]; + public GroupMemberSave[] _memberSave = new GroupMemberSave[128]; + + public LinkshellWork() + { + for (int i = 0; i < _memberSave.Length; i++) + _memberSave[i] = new GroupMemberSave(); + } } } diff --git a/FFXIVClassic World Server/Actor/Group/Work/RetainerWork.cs b/FFXIVClassic World Server/Actor/Group/Work/RetainerWork.cs index 70e8fa05..3fff116a 100644 --- a/FFXIVClassic World Server/Actor/Group/Work/RetainerWork.cs +++ b/FFXIVClassic World Server/Actor/Group/Work/RetainerWork.cs @@ -4,5 +4,11 @@ namespace FFXIVClassic_World_Server.Actor.Group.Work class RetainerWork { public GroupMemberSave[] _memberSave = new GroupMemberSave[128]; + + public RetainerWork() + { + for (int i = 0; i < _memberSave.Length; i++) + _memberSave[i] = new GroupMemberSave(); + } } } diff --git a/FFXIVClassic World Server/DataObjects/Group/Group.cs b/FFXIVClassic World Server/DataObjects/Group/Group.cs index bc7a0861..1a38df0d 100644 --- a/FFXIVClassic World Server/DataObjects/Group/Group.cs +++ b/FFXIVClassic World Server/DataObjects/Group/Group.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group class Group { public const uint PlayerPartyGroup = 10001; - public const uint CompanyGroup = 20001; + public const uint CompanyGroup = 20002; public const uint GroupInvitationRelationGroup = 50001; public const uint TradeRelationGroup = 50002; diff --git a/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs b/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs index d1d3bf7f..70a27ecb 100644 --- a/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs +++ b/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs @@ -14,7 +14,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group public ulong dbId; public string name; - public LinkshellWork linkshellWork = new LinkshellWork(); + public LinkshellWork work = new LinkshellWork(); private List members = new List(); @@ -22,31 +22,31 @@ namespace FFXIVClassic_World_Server.DataObjects.Group { this.dbId = dbId; this.name = name; - linkshellWork._globalSave.crestIcon[0] = crestId; - linkshellWork._globalSave.master = master; - linkshellWork._globalSave.rank = rank; + work._globalSave.crestIcon[0] = crestId; + work._globalSave.master = master; + work._globalSave.rank = rank; } public void setMaster(uint actorId) { - linkshellWork._globalSave.master = (ulong)((0xB36F92 << 8) | actorId); + work._globalSave.master = (ulong)((0xB36F92 << 8) | actorId); } public void setCrest(ushort crestId) { - linkshellWork._globalSave.crestIcon[0] = crestId; + work._globalSave.crestIcon[0] = crestId; } public void setRank(byte rank = 1) { - linkshellWork._globalSave.rank = rank; + work._globalSave.rank = rank; } public void setMemberRank(int index, byte rank) { if (members.Count >= index) return; - linkshellWork._memberSave[index].rank = rank; + work._memberSave[index].rank = rank; } public void AddMember(uint charaId) @@ -87,7 +87,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group { List groupMembers = new List(); foreach (LinkshellMember member in members) - groupMembers.Add(new GroupMember(member.charaId, -1, 0, false, Server.GetServer().GetSession(member.charaId) != null, Server.GetServer().GetNameForId(member.charaId))); + groupMembers.Add(new GroupMember(member.charaId, -1, 0, false, true, Server.GetServer().GetNameForId(member.charaId))); return groupMembers; } @@ -95,14 +95,14 @@ namespace FFXIVClassic_World_Server.DataObjects.Group { SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex); - groupWork.addProperty(this, "linkshellWork._globalSave.master"); - groupWork.addProperty(this, "linkshellWork._globalSave.crestIcon[0]"); - groupWork.addProperty(this, "linkshellWork._globalSave.rank"); + groupWork.addProperty(this, "work._globalSave.master"); + groupWork.addProperty(this, "work._globalSave.crestIcon[0]"); + groupWork.addProperty(this, "work._globalSave.rank"); for (int i = 0; i < members.Count; i++) { - linkshellWork._memberSave[i].rank = members[i].rank; - groupWork.addProperty(this, String.Format("linkshellWork._memberSave[{0}].rank", i)); + work._memberSave[i].rank = members[i].rank; + groupWork.addProperty(this, String.Format("work._memberSave[{0}].rank", i)); } groupWork.setTarget("/_init"); diff --git a/FFXIVClassic World Server/DataObjects/Group/Party.cs b/FFXIVClassic World Server/DataObjects/Group/Party.cs index a4519a2b..25a98aac 100644 --- a/FFXIVClassic World Server/DataObjects/Group/Party.cs +++ b/FFXIVClassic World Server/DataObjects/Group/Party.cs @@ -17,6 +17,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group public Party(ulong groupId, uint leaderCharaId) : base(groupId) { partyGroupWork._globalTemp.owner = (ulong)((0xB36F92 << 8) | leaderCharaId); + members.Add(leaderCharaId); } public void SetLeader(uint actorId) diff --git a/FFXIVClassic World Server/DataObjects/Group/RetainerGroup.cs b/FFXIVClassic World Server/DataObjects/Group/RetainerGroup.cs index 0fab6229..8b15fc98 100644 --- a/FFXIVClassic World Server/DataObjects/Group/RetainerGroup.cs +++ b/FFXIVClassic World Server/DataObjects/Group/RetainerGroup.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group { public RetainerWork work = new RetainerWork(); public uint owner; - public Dictionary members = new Dictionary(); + public List members = new List(); public RetainerGroup(ulong groupId, uint owner) : base(groupId) { @@ -33,10 +33,20 @@ namespace FFXIVClassic_World_Server.DataObjects.Group public override void SendInitWorkValues(Session session) { SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex); - groupWork.addProperty(this, "work._memberSave[0].cdIDOffset"); - groupWork.addProperty(this, "work._memberSave[0].placeName"); - groupWork.addProperty(this, "work._memberSave[0].conditions"); - groupWork.addProperty(this, "work._memberSave[0].level"); + + for (int i = 0; i < members.Count; i++) + { + work._memberSave[i].cdIDOffset = members[i].cdIDOffset; + work._memberSave[i].placeName = members[i].placeName; + work._memberSave[i].conditions = members[i].conditions; + work._memberSave[i].level = members[i].level; + + groupWork.addProperty(this, String.Format("work._memberSave[{0}].cdIDOffset", i)); + groupWork.addProperty(this, String.Format("work._memberSave[{0}].placeName", i)); + groupWork.addProperty(this, String.Format("work._memberSave[{0}].conditions", i)); + groupWork.addProperty(this, String.Format("work._memberSave[{0}].level", i)); + } + groupWork.setTarget("/_init"); SubPacket test = groupWork.buildPacket(session.sessionId, session.sessionId); @@ -45,7 +55,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group public override int GetMemberCount() { - return members.Count; + return members.Count + 1; } public override uint GetTypeId() @@ -55,9 +65,15 @@ namespace FFXIVClassic_World_Server.DataObjects.Group public override List BuildMemberList() { - List groupMembers = new List(); - foreach (RetainerGroupMember member in members.Values) - groupMembers.Add(new GroupMember(member.retainerId, -1, 0, false, true, member.name)); + List groupMembers = new List(); + + //Add retainers + foreach (RetainerGroupMember member in members) + groupMembers.Add(new GroupMember(member.id, -1, 0, false, true, member.name)); + + //Add player + groupMembers.Add(new GroupMember(owner, -1, 0, false, true, Server.GetServer().GetNameForId(owner))); + return groupMembers; } } diff --git a/FFXIVClassic World Server/DataObjects/Group/RetainerGroupMember.cs b/FFXIVClassic World Server/DataObjects/Group/RetainerGroupMember.cs index f410a5fd..acd5e535 100644 --- a/FFXIVClassic World Server/DataObjects/Group/RetainerGroupMember.cs +++ b/FFXIVClassic World Server/DataObjects/Group/RetainerGroupMember.cs @@ -8,7 +8,23 @@ namespace FFXIVClassic_World_Server.DataObjects.Group { class RetainerGroupMember { - public uint retainerId; + public uint id; public string name; + public uint classActorId; + public byte cdIDOffset; + public ushort placeName; + public byte conditions; + public byte level; + + public RetainerGroupMember(uint id, string name, uint classActorId, byte cdIDOffset, ushort placeName, byte conditions, byte level) + { + this.id = id; + this.name = name; + this.classActorId = classActorId; + this.cdIDOffset = cdIDOffset; + this.placeName = placeName; + this.conditions = conditions; + this.level = level; + } } } diff --git a/FFXIVClassic World Server/Database.cs b/FFXIVClassic World Server/Database.cs index e79d4b56..fc738dfd 100644 --- a/FFXIVClassic World Server/Database.cs +++ b/FFXIVClassic World Server/Database.cs @@ -118,11 +118,44 @@ namespace FFXIVClassic_World_Server { return 0; } - } + } - public static Dictionary GetRetainers(uint charaId) + public static List GetRetainers(uint charaId) { - throw new NotImplementedException(); + List members = new List(); + using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) + { + try + { + conn.Open(); + MySqlCommand cmd = new MySqlCommand("SELECT id, name, classActorId, cdIDOffset, placeName, conditions, level FROM server_retainers INNER JOIN characters_retainers ON retainerId = server_retainers.id WHERE characterId = @charaId", conn); + cmd.Parameters.AddWithValue("@charaId", charaId); + using (MySqlDataReader Reader = cmd.ExecuteReader()) + { + while (Reader.Read()) + { + uint id = Reader.GetUInt32("id") | 0xE0000000; + string name = Reader.GetString("name"); + uint classActorId = Reader.GetUInt32("classActorId"); + byte cdIDOffset = Reader.GetByte("cdIDOffset"); + ushort placeName = Reader.GetUInt16("placeName"); + byte conditions = Reader.GetByte("conditions"); + byte level = Reader.GetByte("level"); + + members.Add(new RetainerGroupMember(id, name, classActorId, cdIDOffset, placeName, conditions, level)); + } + } + } + catch (MySqlException e) + { + Program.Log.Error(e.ToString()); + } + finally + { + conn.Dispose(); + } + } + return members; } public static Linkshell GetLinkshell(ulong groupIndex, ulong id) @@ -203,8 +236,8 @@ namespace FFXIVClassic_World_Server try { conn.Open(); - MySqlCommand cmd = new MySqlCommand("SELECT characterId, linkshellId, rank FROM characters_linkshells WHERE characterid = @charaId", conn); - cmd.Parameters.AddWithValue("@lsId", charaId); + MySqlCommand cmd = new MySqlCommand("SELECT characterId, linkshellId, rank FROM characters_linkshells WHERE characterId = @charaId", conn); + cmd.Parameters.AddWithValue("@charaId", charaId); using (MySqlDataReader Reader = cmd.ExecuteReader()) { while (Reader.Read()) @@ -232,7 +265,45 @@ namespace FFXIVClassic_World_Server public static ulong CreateLinkshell(string name, ushort crest, uint master) { - throw new NotImplementedException(); + string query; + MySqlCommand cmd; + ulong lastId = 0; + + using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) + { + try + { + conn.Open(); + + query = @" + INSERT INTO server_linkshells + (name, crestIcon, master, rank) + VALUES + (@name, @crestIcon, @master, @rank) + ON DUPLICATE KEY UPDATE + questData = @questData, questFlags = @questFlags + "; + + cmd = new MySqlCommand(query, conn); + cmd.Parameters.AddWithValue("@name", name); + cmd.Parameters.AddWithValue("@crestIcon", crest); + cmd.Parameters.AddWithValue("@master", master); + cmd.Parameters.AddWithValue("@rank", 0xa); + + if (cmd.ExecuteNonQuery() == 1) + lastId = (ulong)cmd.LastInsertedId; + } + catch (MySqlException e) + { + Program.Log.Error(e.ToString()); + } + finally + { + conn.Dispose(); + } + } + + return lastId; } public static bool DeleteLinkshell(ulong lsId) @@ -240,7 +311,7 @@ namespace FFXIVClassic_World_Server throw new NotImplementedException(); } - public static bool LinkshellAddPlayer(ulong dbId, uint charaId) + public static bool LinkshellAddPlayer(ulong lsId, uint charaId) { throw new NotImplementedException(); } @@ -249,6 +320,31 @@ namespace FFXIVClassic_World_Server { throw new NotImplementedException(); } - + + public static bool ChangeLinkshellCrest(ulong lsId, ushort newCrestId) + { + bool success = false; + using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) + { + try + { + conn.Open(); + MySqlCommand cmd = new MySqlCommand("UPDATE server_linkshells SET crestIcon = @crestIcon WHERE id = @lsId", conn); + cmd.Parameters.AddWithValue("@lsId", lsId); + cmd.Parameters.AddWithValue("@crestIcon", newCrestId); + cmd.ExecuteNonQuery(); + success = true; + } + catch (MySqlException e) + { + Program.Log.Error(e.ToString()); + } + finally + { + conn.Dispose(); + } + } + return success; + } } } diff --git a/FFXIVClassic World Server/FFXIVClassic World Server.csproj b/FFXIVClassic World Server/FFXIVClassic World Server.csproj index 3949d63f..5b2e5c53 100644 --- a/FFXIVClassic World Server/FFXIVClassic World Server.csproj +++ b/FFXIVClassic World Server/FFXIVClassic World Server.csproj @@ -100,6 +100,7 @@ + diff --git a/FFXIVClassic World Server/LinkshellManager.cs b/FFXIVClassic World Server/LinkshellManager.cs index 5b751a97..f98da1cf 100644 --- a/FFXIVClassic World Server/LinkshellManager.cs +++ b/FFXIVClassic World Server/LinkshellManager.cs @@ -43,9 +43,29 @@ namespace FFXIVClassic_World_Server } } - //Modifies the LS - public bool ModifyLinkshell() + //Modifies the LS master + public bool ChangeLinkshellMaster(string name, uint newMaster) { + foreach (Linkshell ls in mLinkshellList.Values) + { + if (ls.name.Equals(name)) + { + return false; + } + } + return false; + } + + //Modifies the LS crest + public bool ChangeLinkshellCrest(string name, ushort newCrestId) + { + foreach (Linkshell ls in mLinkshellList.Values) + { + if (ls.name.Equals(name)) + { + return Database.ChangeLinkshellCrest(ls.dbId, newCrestId); + } + } return false; } diff --git a/FFXIVClassic World Server/PacketProcessor.cs b/FFXIVClassic World Server/PacketProcessor.cs index 0df0beb0..bf11afa1 100644 --- a/FFXIVClassic World Server/PacketProcessor.cs +++ b/FFXIVClassic World Server/PacketProcessor.cs @@ -1,6 +1,7 @@ using FFXIVClassic.Common; using FFXIVClassic_World_Server.DataObjects; using FFXIVClassic_World_Server.Packets.Receive; +using FFXIVClassic_World_Server.Packets.Receive.Subpackets; using FFXIVClassic_World_Server.Packets.Send; using FFXIVClassic_World_Server.Packets.Send.Login; using FFXIVClassic_World_Server.Packets.WorldPackets.Receive; @@ -51,7 +52,9 @@ namespace FFXIVClassic_World_Server if (packet.header.connectionType == BasePacket.TYPE_ZONE) { mServer.AddSession(client, Session.Channel.ZONE, hello.sessionId); - mServer.GetWorldManager().DoLogin(mServer.GetSession(hello.sessionId)); + Session session = mServer.GetSession(hello.sessionId); + session.routing1 = mServer.GetWorldManager().GetZoneServer(session.currentZoneId); + session.routing1.SendSessionStart(session); } else if (packet.header.connectionType == BasePacket.TYPE_CHAT) mServer.AddSession(client, Session.Channel.CHAT, hello.sessionId); @@ -75,10 +78,12 @@ namespace FFXIVClassic_World_Server } //Game Message else if (subpacket.header.type == 0x03) - { + { //Send to the correct zone server uint targetSession = subpacket.header.targetId; + InterceptProcess(mServer.GetSession(targetSession), subpacket); + if (mServer.GetSession(targetSession).routing1 != null) mServer.GetSession(targetSession).routing1.SendPacket(subpacket); @@ -142,5 +147,20 @@ namespace FFXIVClassic_World_Server } } + public void InterceptProcess(Session session, SubPacket subpacket) + { + switch (subpacket.gameMessage.opcode) + { + case 0x6: + mServer.GetWorldManager().DoLogin(session); + break; + //Special case for groups. If it's a world group, send values, else send to zone server + case 0x133: + GroupCreatedPacket groupCreatedPacket = new GroupCreatedPacket(subpacket.data); + if (!mServer.GetWorldManager().SendGroupInit(session, groupCreatedPacket.groupId)) + session.clientConnection.QueuePacket(subpacket, true, false); + break; + } + } } } diff --git a/FFXIVClassic World Server/Packets/Send/Subpackets/SendMessagePacket.cs b/FFXIVClassic World Server/Packets/Send/Subpackets/SendMessagePacket.cs new file mode 100644 index 00000000..1830f50e --- /dev/null +++ b/FFXIVClassic World Server/Packets/Send/Subpackets/SendMessagePacket.cs @@ -0,0 +1,58 @@ +using System; +using System.IO; +using System.Text; + +using FFXIVClassic.Common; + +namespace FFXIVClassic_World_Server.Packets.Send.Subpackets +{ + class SendMessagePacket + { + public const int MESSAGE_TYPE_NONE = 0; + public const int MESSAGE_TYPE_SAY = 1; + public const int MESSAGE_TYPE_SHOUT = 2; + public const int MESSAGE_TYPE_TELL = 3; + public const int MESSAGE_TYPE_PARTY = 4; + public const int MESSAGE_TYPE_LINKSHELL1 = 5; + public const int MESSAGE_TYPE_LINKSHELL2 = 6; + public const int MESSAGE_TYPE_LINKSHELL3 = 7; + public const int MESSAGE_TYPE_LINKSHELL4 = 8; + public const int MESSAGE_TYPE_LINKSHELL5 = 9; + public const int MESSAGE_TYPE_LINKSHELL6 = 10; + public const int MESSAGE_TYPE_LINKSHELL7 = 11; + public const int MESSAGE_TYPE_LINKSHELL8 = 12; + + public const int MESSAGE_TYPE_SAY_SPAM = 22; + public const int MESSAGE_TYPE_SHOUT_SPAM = 23; + public const int MESSAGE_TYPE_TELL_SPAM = 24; + public const int MESSAGE_TYPE_CUSTOM_EMOTE = 25; + public const int MESSAGE_TYPE_EMOTE_SPAM = 26; + public const int MESSAGE_TYPE_STANDARD_EMOTE = 27; + public const int MESSAGE_TYPE_URGENT_MESSAGE = 28; + public const int MESSAGE_TYPE_GENERAL_INFO = 29; + public const int MESSAGE_TYPE_SYSTEM = 32; + public const int MESSAGE_TYPE_SYSTEM_ERROR = 33; + + public const ushort OPCODE = 0x0003; + public const uint PACKET_SIZE = 0x248; + + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint messageType, string sender, string message) + { + byte[] data = new byte[PACKET_SIZE - 0x20]; + + using (MemoryStream mem = new MemoryStream(data)) + { + using (BinaryWriter binWriter = new BinaryWriter(mem)) + { + binWriter.Write(Encoding.ASCII.GetBytes(sender), 0, Encoding.ASCII.GetByteCount(sender) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(sender)); + binWriter.BaseStream.Seek(0x20, SeekOrigin.Begin); + binWriter.Write((UInt32)messageType); + binWriter.Write(Encoding.ASCII.GetBytes(message), 0, Encoding.ASCII.GetByteCount(message) >= 0x200 ? 0x200 : Encoding.ASCII.GetByteCount(message)); + } + } + + return new SubPacket(OPCODE, playerActorID, targetID, data); + } + + } +} diff --git a/FFXIVClassic World Server/Packets/WorldPackets/Receive/Group/ModifyLinkshellPacket.cs b/FFXIVClassic World Server/Packets/WorldPackets/Receive/Group/ModifyLinkshellPacket.cs index 7fd5f3ca..c6c94eb1 100644 --- a/FFXIVClassic World Server/Packets/WorldPackets/Receive/Group/ModifyLinkshellPacket.cs +++ b/FFXIVClassic World Server/Packets/WorldPackets/Receive/Group/ModifyLinkshellPacket.cs @@ -8,6 +8,7 @@ namespace FFXIVClassic_World_Server.Packets.WorldPackets.Receive.Group { public bool invalidPacket = false; + public string currentName; public ushort argCode; public string name; public ushort crestid; @@ -21,6 +22,7 @@ namespace FFXIVClassic_World_Server.Packets.WorldPackets.Receive.Group { try { + currentName = Encoding.ASCII.GetString(binReader.ReadBytes(0x20)).Trim(new[] { '\0' }); argCode = binReader.ReadUInt16(); switch (argCode) diff --git a/FFXIVClassic World Server/RetainerGroupManager.cs b/FFXIVClassic World Server/RetainerGroupManager.cs index 8f806a8f..5fa14b34 100644 --- a/FFXIVClassic World Server/RetainerGroupManager.cs +++ b/FFXIVClassic World Server/RetainerGroupManager.cs @@ -36,10 +36,8 @@ namespace FFXIVClassic_World_Server ulong groupId = mWorldManager.GetGroupIndex(); RetainerGroup retainerGroup = new RetainerGroup(groupId, charaId); - Dictionary members = Database.GetRetainers(charaId); - if (members == null) - return null; - + List members = Database.GetRetainers(charaId); + retainerGroup.members = members; mRetainerGroupList.Add(charaId, retainerGroup); mCurrentWorldGroupsReference.Add(groupId, retainerGroup); diff --git a/FFXIVClassic World Server/Server.cs b/FFXIVClassic World Server/Server.cs index 4c80709e..37331b0c 100644 --- a/FFXIVClassic World Server/Server.cs +++ b/FFXIVClassic World Server/Server.cs @@ -218,7 +218,9 @@ namespace FFXIVClassic_World_Server //Linkshell modify request case 0x1024: ModifyLinkshellPacket modifyLinkshellpacket = new ModifyLinkshellPacket(subpacket.data); - mWorldManager.GetLinkshellManager().ModifyLinkshell(); + + if (modifyLinkshellpacket.argCode == 0) + mWorldManager.GetLinkshellManager().ChangeLinkshellCrest(modifyLinkshellpacket.currentName, modifyLinkshellpacket.crestid); break; //Group Add/Remove Member case 0x1022: @@ -226,17 +228,6 @@ namespace FFXIVClassic_World_Server break; } } - //Special case for groups. If it's a world group, send values, else send to zone server - else if (subpacket.gameMessage.opcode == 0x133) - { - GroupCreatedPacket groupCreatedPacket = new GroupCreatedPacket(subpacket.data); - if (!mWorldManager.SendGroupInit(session, groupCreatedPacket.groupId)) - { - ClientConnection conn = mZoneSessionList[sessionId].clientConnection; - conn.QueuePacket(subpacket, true, false); - conn.FlushQueuedSendPackets(); - } - } else if (mZoneSessionList.ContainsKey(sessionId)) { ClientConnection conn = mZoneSessionList[sessionId].clientConnection; diff --git a/FFXIVClassic World Server/WorldMaster.cs b/FFXIVClassic World Server/WorldMaster.cs index eb1f4839..ae0d7c83 100644 --- a/FFXIVClassic World Server/WorldMaster.cs +++ b/FFXIVClassic World Server/WorldMaster.cs @@ -1,6 +1,7 @@ using FFXIVClassic.Common; using FFXIVClassic_World_Server.DataObjects; using FFXIVClassic_World_Server.DataObjects.Group; +using FFXIVClassic_World_Server.Packets.Send.Subpackets; using FFXIVClassic_World_Server.Packets.Send.Subpackets.Groups; using FFXIVClassic_World_Server.Packets.WorldPackets.Send; using MySql.Data.MySqlClient; @@ -205,9 +206,23 @@ namespace FFXIVClassic_World_Server //Login Zone In public void DoLogin(Session session) - { - session.routing1 = GetZoneServer(session.currentZoneId); - session.routing1.SendSessionStart(session); + { + SendMotD(session); + + //Send party, retainer, ls groups + mPartyManager.GetParty(session.sessionId).SendGroupPackets(session); + mRetainerGroupManager.GetRetainerGroup(session.sessionId).SendGroupPackets(session); + List linkshells = mLinkshellManager.GetPlayerLinkshellMembership(session.sessionId); + foreach (Linkshell ls in linkshells) + ls.SendGroupPackets(session); + } + + private void SendMotD(Session session) + { + session.clientConnection.QueuePacket(SendMessagePacket.BuildPacket(session.sessionId, session.sessionId, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", "-------- Login Message --------"), true, false); + session.clientConnection.QueuePacket(SendMessagePacket.BuildPacket(session.sessionId, session.sessionId, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", "Welcome to !"), true, false); + session.clientConnection.QueuePacket(SendMessagePacket.BuildPacket(session.sessionId, session.sessionId, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", "Welcome to Eorzea!"), true, false); + session.clientConnection.QueuePacket(SendMessagePacket.BuildPacket(session.sessionId, session.sessionId, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", "Here is a test Message of the Day from the World Server!"), true, false); } public class ZoneEntrance @@ -271,7 +286,7 @@ namespace FFXIVClassic_World_Server public ulong GetGroupIndex() { - return mRunningGroupIndex; + return mRunningGroupIndex | 0x8000000000000000; } public bool SendGroupInit(Session session, ulong groupId)