From e96cc0c7582b48b303d18b940f995f35834da374 Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Tue, 4 Jun 2019 01:16:39 -0400
Subject: [PATCH] Minor edits to the previous commit.

---
 FFXIVClassic Map Server/Database.cs                    | 10 ++++++----
 FFXIVClassic Map Server/PacketProcessor.cs             |  2 +-
 .../receive/AchievementProgressRequestPacket.cs        |  5 ++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/FFXIVClassic Map Server/Database.cs b/FFXIVClassic Map Server/Database.cs
index 426df1fb..a9683de6 100644
--- a/FFXIVClassic Map Server/Database.cs	
+++ b/FFXIVClassic Map Server/Database.cs	
@@ -2134,7 +2134,8 @@ namespace FFXIVClassic_Map_Server
 
             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;
             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 = @"
                                     SELECT progress, progressFlags 
                                     FROM characters_achievements 
-                                    WHERE characterId = @charId AND achievementId = @cheevoId";
+                                    WHERE characterId = @charId AND achievementId = @achievementId";
 
                     MySqlCommand cmd = new MySqlCommand(query, conn);
                     cmd.Parameters.AddWithValue("@charId", player.actorId);
-                    cmd.Parameters.AddWithValue("@cheevoId", AchievementID);
+                    cmd.Parameters.AddWithValue("@achievementId", achievementId);
                     using (MySqlDataReader reader = cmd.ExecuteReader())
                     {
                         while (reader.Read())
@@ -2169,8 +2170,9 @@ namespace FFXIVClassic_Map_Server
                     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)
         {
             bool success = false;
diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs
index 38102141..8360e652 100644
--- a/FFXIVClassic Map Server/PacketProcessor.cs	
+++ b/FFXIVClassic Map Server/PacketProcessor.cs	
@@ -262,7 +262,7 @@ namespace FFXIVClassic_Map_Server
                     //Achievement Progress Request
                     case 0x0135:
                         AchievementProgressRequestPacket progressRequest = new AchievementProgressRequestPacket(subpacket.data);
-                        session.QueuePacket(Database.GetAchievementProgress(session.GetActor(), progressRequest.achievementID));
+                        session.QueuePacket(Database.GetAchievementProgress(session.GetActor(), progressRequest.achievementId));
                         break;
                     /* RECRUITMENT */
                     //Start Recruiting
diff --git a/FFXIVClassic Map Server/packets/receive/AchievementProgressRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/AchievementProgressRequestPacket.cs
index 2f04e928..15c76bbe 100644
--- a/FFXIVClassic Map Server/packets/receive/AchievementProgressRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/AchievementProgressRequestPacket.cs	
@@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.receive
     {
         public bool invalidPacket = false;
 
-        public uint achievementID;
+        public uint achievementId;
         public uint responseType;
 
         public AchievementProgressRequestPacket(byte[] data)
@@ -18,9 +18,8 @@ namespace FFXIVClassic_Map_Server.packets.receive
                 {
                     try
                     {
-                        achievementID = binReader.ReadUInt32();
+                        achievementId = binReader.ReadUInt32();
                         responseType = binReader.ReadUInt32();
-
                     }
                     catch (Exception)
                     {