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

Party sync is done. Finished kick/promote code. Client is now always at the top of pt list.

Browse Source
This commit is contained in:
Filip Maj
2016-12-21 21:49:50 -05:00
parent 506bcbaf87
commit 2b10221a75
11 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic World Server/DataObjects/Group/Group.cs
View File

@@ -43,7 +43,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return -1;
}
public virtual List<GroupMember> BuildMemberList()
public virtual List<GroupMember> BuildMemberList(uint id)
{
return new List<GroupMember>();
}
@@ -62,7 +62,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public void SendGroupPackets(Session session)
{
ulong time = Utils.MilisUnixTimeStampUTC();
List<GroupMember> members = BuildMemberList();
List<GroupMember> members = BuildMemberList(session.sessionId);
session.clientConnection.QueuePacket(GroupHeaderPacket.buildPacket(session.sessionId, session.currentZoneId, time, this), true, false);
session.clientConnection.QueuePacket(GroupMembersBeginPacket.buildPacket(session.sessionId, session.currentZoneId, time, this), true, false);

2
FFXIVClassic World Server/DataObjects/Group/Linkshell.cs
View File

@@ -83,7 +83,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return Group.CompanyGroup;
}
public override List<GroupMember> BuildMemberList()
public override List<GroupMember> BuildMemberList(uint id)
{
List<GroupMember> groupMembers = new List<GroupMember>();
foreach (LinkshellMember member in members)

38
FFXIVClassic World Server/DataObjects/Group/Party.cs
View File

@@ -21,6 +21,11 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
}
public void SetLeaderPlayerRequest(Session requestSession, string name)
{
SetLeaderPlayerRequest(requestSession, GetIdForName(name));
}
public void SetLeaderPlayerRequest(Session requestSession, uint actorId)
{
if (GetLeader() != requestSession.sessionId)
{
@@ -28,16 +33,16 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return;
}
uint newLeader = GetIdForName(name);
uint newLeader = actorId;
if (newLeader == 0)
if (!members.Contains(actorId))
{
requestSession.SendGameMessage(30575, 0x20);
requestSession.SendGameMessage(30567, 0x20);
return;
}
else if (newLeader == GetLeader())
{
requestSession.SendGameMessage(30563, 0x20, name);
requestSession.SendGameMessage(30559, 0x20, (Object)Server.GetServer().GetNameForId(actorId));
return;
}
@@ -49,13 +54,18 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
Session session = Server.GetServer().GetSession(members[i]);
if (session == null)
continue;
session.SendGameMessage(30429, 0x20, Server.GetServer().GetNameForId(members[i]));
session.SendGameMessage(30429, 0x20, (Object)Server.GetServer().GetNameForId(actorId));
}
Server.GetServer().GetWorldManager().SendPartySync(this);
Server.GetServer().GetWorldManager().SendPartySync(this);
}
public void KickPlayerRequest(Session requestSession, string name)
{
KickPlayerRequest(requestSession, GetIdForName(name));
}
public void KickPlayerRequest(Session requestSession, uint actorId)
{
if (GetLeader() != requestSession.sessionId)
{
@@ -63,9 +73,9 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return;
}
uint kickedMemberId = GetIdForName(name);
uint kickedMemberId = actorId;
if (kickedMemberId == 0)
if (!members.Contains(actorId))
{
requestSession.SendGameMessage(30575, 0x20);
return;
@@ -80,7 +90,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
if (members[i] == kickedMemberId)
session.SendGameMessage(30410, 0x20);
else
session.SendGameMessage(30428, 0x20, (Object)name);
session.SendGameMessage(30428, 0x20, (Object)Server.GetServer().GetNameForId(actorId));
}
//All good, remove
@@ -106,7 +116,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public void SetLeader(uint actorId)
{
partyGroupWork._globalTemp.owner = (ulong)((actorId << 32) | 0xB36F92);
partyGroupWork._globalTemp.owner = (ulong)(((ulong)actorId << 32) | 0xB36F92);
}
public uint GetLeader()
@@ -152,11 +162,15 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return Group.PlayerPartyGroup;
}
public override List<GroupMember> BuildMemberList()
public override List<GroupMember> BuildMemberList(uint id)
{
List<GroupMember> groupMembers = new List<GroupMember>();
groupMembers.Add(new GroupMember(id, -1, 0, false, true, Server.GetServer().GetNameForId(id)));
foreach (uint charaId in members)
groupMembers.Add(new GroupMember(charaId, -1, 0, false, true, Server.GetServer().GetNameForId(charaId)));
{
if (charaId != id)
groupMembers.Add(new GroupMember(charaId, -1, 0, false, true, Server.GetServer().GetNameForId(charaId)));
}
return groupMembers;
}

2
FFXIVClassic World Server/DataObjects/Group/Relation.cs
View File

@@ -31,7 +31,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return Group.GroupInvitationRelationGroup;
}
public override List<GroupMember> BuildMemberList()
public override List<GroupMember> BuildMemberList(uint id)
{
List<GroupMember> groupMembers = new List<GroupMember>();

2
FFXIVClassic World Server/DataObjects/Group/RetainerGroup.cs
View File

@@ -63,7 +63,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return Group.RetainerGroup;
}
public override List<GroupMember> BuildMemberList()
public override List<GroupMember> BuildMemberList(uint id)
{
List<GroupMember> groupMembers = new List<GroupMember>();