Minor edits to the previous commit.

This commit is contained in:
Filip Maj 2019-06-04 01:16:39 -04:00
parent 2195b0b7dc
commit e96cc0c758
3 changed files with 9 additions and 8 deletions

View File

@ -2134,7 +2134,8 @@ namespace FFXIVClassic_Map_Server
return cheevosPacket.BuildPacket(player.actorId); return cheevosPacket.BuildPacket(player.actorId);
} }
public static SubPacket GetAchievementProgress(Player player, uint AchievementID)
public static SubPacket GetAchievementProgress(Player player, uint achievementId)
{ {
uint progress = 0, progressFlags = 0; uint progress = 0, progressFlags = 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))) 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)))
@ -2146,11 +2147,11 @@ namespace FFXIVClassic_Map_Server
string query = @" string query = @"
SELECT progress, progressFlags SELECT progress, progressFlags
FROM characters_achievements FROM characters_achievements
WHERE characterId = @charId AND achievementId = @cheevoId"; WHERE characterId = @charId AND achievementId = @achievementId";
MySqlCommand cmd = new MySqlCommand(query, conn); MySqlCommand cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
cmd.Parameters.AddWithValue("@cheevoId", AchievementID); cmd.Parameters.AddWithValue("@achievementId", achievementId);
using (MySqlDataReader reader = cmd.ExecuteReader()) using (MySqlDataReader reader = cmd.ExecuteReader())
{ {
while (reader.Read()) while (reader.Read())
@ -2169,8 +2170,9 @@ namespace FFXIVClassic_Map_Server
conn.Dispose(); conn.Dispose();
} }
} }
return SendAchievementRatePacket.BuildPacket(player.actorId, AchievementID, progress, progressFlags); return SendAchievementRatePacket.BuildPacket(player.actorId, achievementId, progress, progressFlags);
} }
public static bool CreateLinkshell(Player player, string lsName, ushort lsCrest) public static bool CreateLinkshell(Player player, string lsName, ushort lsCrest)
{ {
bool success = false; bool success = false;

View File

@ -262,7 +262,7 @@ namespace FFXIVClassic_Map_Server
//Achievement Progress Request //Achievement Progress Request
case 0x0135: case 0x0135:
AchievementProgressRequestPacket progressRequest = new AchievementProgressRequestPacket(subpacket.data); AchievementProgressRequestPacket progressRequest = new AchievementProgressRequestPacket(subpacket.data);
session.QueuePacket(Database.GetAchievementProgress(session.GetActor(), progressRequest.achievementID)); session.QueuePacket(Database.GetAchievementProgress(session.GetActor(), progressRequest.achievementId));
break; break;
/* RECRUITMENT */ /* RECRUITMENT */
//Start Recruiting //Start Recruiting

View File

@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.receive
{ {
public bool invalidPacket = false; public bool invalidPacket = false;
public uint achievementID; public uint achievementId;
public uint responseType; public uint responseType;
public AchievementProgressRequestPacket(byte[] data) public AchievementProgressRequestPacket(byte[] data)
@ -18,9 +18,8 @@ namespace FFXIVClassic_Map_Server.packets.receive
{ {
try try
{ {
achievementID = binReader.ReadUInt32(); achievementId = binReader.ReadUInt32();
responseType = binReader.ReadUInt32(); responseType = binReader.ReadUInt32();
} }
catch (Exception) catch (Exception)
{ {