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

LS kicking and leaving work.

Browse Source
This commit is contained in:
Filip Maj
2017-01-09 00:12:11 -05:00
parent 61e4effd74
commit 771b5b6d81
7 changed files with 139 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,8 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public void SendDeletePacket(Session session)
{
session.clientConnection.QueuePacket(DeleteGroupPacket.buildPacket(session.sessionId, this), true, false);
if (session != null)
session.clientConnection.QueuePacket(DeleteGroupPacket.buildPacket(session.sessionId, this), true, false);
}
public virtual void SendInitWorkValues(Session session)

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

@@ -176,6 +176,19 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
}
}
public LinkshellMember GetMember(string name)
{
lock (members)
{
for (int i = 0; i < members.Count; i++)
{
if (Server.GetServer().GetNameForId((members[i].charaId)).Equals(name))
return members[i];
}
return null;
}
}
public bool HasMember(uint id)
{
lock (members)
@@ -203,14 +216,56 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
return;
}
//Send you are leaving message
requestSession.SendGameMessage(25162, 0x20, (Object)1, (Object)Server.GetServer().GetNameForId(leaver));
requestSession.SendGameMessage(25162, 0x20, (Object)1, name);
//All good, remove
Server.GetServer().GetWorldManager().GetLinkshellManager().RemoveMemberFromLinkshell(requestSession.sessionId, name);
SendGroupPacketsAll(GetMemberIds());
ResendWorkValues();
//Delete group for kicked guy
SendDeletePacket(requestSession);
}
public void KickRequest(Session requestSession, string kickedName)
{
LinkshellMember kicked = GetMember(kickedName);
Session kickedSession = Server.GetServer().GetSession(kicked.charaId);
//Check if ls contains this person
if (!HasMember(kicked.charaId))
{
requestSession.SendGameMessage(25281, 0x20, (Object)1, (Object)kickedName, (Object)name);
return;
}
//Send you are exiled message
lock (members)
{
for (int i = 0; i < members.Count; i++)
{
Session session = Server.GetServer().GetSession(members[i].charaId);
if (session == null)
continue;
if (session.sessionId == kicked.charaId)
session.SendGameMessage(25184, 0x20, (Object)1, (Object)name);
else
session.SendGameMessage(25280, 0x20, (Object)1, (Object)kickedName, (Object)name);
}
}
//All good, remove
Server.GetServer().GetWorldManager().GetLinkshellManager().RemoveMemberFromLinkshell(kicked.charaId, name);
SendGroupPacketsAll(GetMemberIds());
ResendWorkValues();
//Delete group for kicked guy
SendDeletePacket(kickedSession);
}
public void RankChangeRequest(Session requestSession, string name, byte rank)
@@ -221,9 +276,12 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
if (Server.GetServer().GetNameForId(members[i].charaId).Equals(name))
{
members[i].rank = rank;
ResendWorkValues();
requestSession.SendGameMessage(25277, 0x20, (object)(100000 + rank), (object)name);
if (Database.LinkshellChangeRank(members[i].charaId, rank))
{
members[i].rank = rank;
ResendWorkValues();
requestSession.SendGameMessage(25277, 0x20, (object)(100000 + rank), (object)name);
}
return;
}
}

55
FFXIVClassic World Server/Database.cs
View File

@@ -420,7 +420,34 @@ namespace FFXIVClassic_World_Server
public static bool LinkshellRemovePlayer(ulong lsId, uint charaId)
{
throw new NotImplementedException();
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();
string query = @"
DELETE FROM characters_linkshells
WHERE characterId = @charaId AND linkshellId = @lsId;
";
MySqlCommand cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charaId", charaId);
cmd.Parameters.AddWithValue("@lsId", lsId);
cmd.ExecuteNonQuery();
success = true;
}
catch (MySqlException e)
{
Program.Log.Error(e.ToString());
}
finally
{
conn.Dispose();
}
}
return success;
}
public static bool ChangeLinkshellCrest(ulong lsId, ushort newCrestId)
@@ -448,5 +475,31 @@ namespace FFXIVClassic_World_Server
}
return success;
}
public static bool LinkshellChangeRank(uint charaId, byte rank)
{
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 characters_linkshells SET rank = @rank WHERE characterId = @charaId", conn);
cmd.Parameters.AddWithValue("@charaId", charaId);
cmd.Parameters.AddWithValue("@rank", rank);
cmd.ExecuteNonQuery();
success = true;
}
catch (MySqlException e)
{
Program.Log.Error(e.ToString());
}
finally
{
conn.Dispose();
}
}
return success;
}
}
}

6
FFXIVClassic World Server/Packets/WorldPackets/Receive/Group/LinkshellLeavePacket.cs
View File

@@ -9,8 +9,9 @@ namespace FFXIVClassic_World_Server.Packets.WorldPackets.Receive.Group
{
public bool invalidPacket = false;
public bool isDisband;
public bool isKicked;
public string lsName;
public string kickedName;
public LinkshellLeavePacket(byte[] data)
{
@@ -20,7 +21,8 @@ namespace FFXIVClassic_World_Server.Packets.WorldPackets.Receive.Group
{
try
{
isDisband = binReader.ReadUInt16() == 1;
isKicked = binReader.ReadUInt16() == 1;
kickedName = Encoding.ASCII.GetString(binReader.ReadBytes(0x20)).Trim(new[] { '\0' });
lsName = Encoding.ASCII.GetString(binReader.ReadBytes(0x20)).Trim(new[] { '\0' });
}
catch (Exception)

6
FFXIVClassic World Server/Server.cs
View File

@@ -315,12 +315,12 @@ namespace FFXIVClassic_World_Server
LinkshellInviteCancelPacket linkshellInviteCancelPacket = new LinkshellInviteCancelPacket(subpacket.data);
mWorldManager.ProcessLinkshellInviteCancel(GetSession(subpacket.header.sourceId));
break;
//Linkshell resign/disband
//Linkshell resign/kicked
case 0x1031:
LinkshellLeavePacket linkshellLeavePacket = new LinkshellLeavePacket(subpacket.data);
Linkshell lsLeave = mWorldManager.GetLinkshellManager().GetLinkshell(linkshellLeavePacket.lsName);
if (linkshellLeavePacket.isDisband)
lsLeave.DisbandRequest(GetSession(subpacket.header.sourceId));
if (linkshellLeavePacket.isKicked)
lsLeave.KickRequest(GetSession(subpacket.header.sourceId), linkshellLeavePacket.kickedName);
else
lsLeave.LeaveRequest(GetSession(subpacket.header.sourceId));
break;