From c229ef37428e608e792d7b769ee56fc26e9da5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= <zhengpeiru21@protonmail.com>
Date: Wed, 21 Sep 2022 09:44:47 -0600
Subject: [PATCH] Enable code that had been waiting for upstream PR merge

---
 src/IndividualProgression.cpp       |  2 +-
 src/IndividualProgressionPlayer.cpp | 57 ++++++++++++++---------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/IndividualProgression.cpp b/src/IndividualProgression.cpp
index f1a203f..9b6374f 100644
--- a/src/IndividualProgression.cpp
+++ b/src/IndividualProgression.cpp
@@ -272,7 +272,7 @@ public:
         if (sIndividualProgression->simpleConfigOverride)
         {
             sWorld->setIntConfig(CONFIG_WATER_BREATH_TIMER, 60000);
-//            sWorld->setBoolConfig(CONFIG_OBJECT_QUEST_MARKERS, false); Waiting for PR merge: https://github.com/azerothcore/azerothcore-wotlk/pull/13013
+            sWorld->setBoolConfig(CONFIG_OBJECT_QUEST_MARKERS, false);
             sWorld->setBoolConfig(CONFIG_OBJECT_SPARKLES, false);
             sWorld->setBoolConfig(CONFIG_PLAYER_SETTINGS_ENABLED, true);
         }
diff --git a/src/IndividualProgressionPlayer.cpp b/src/IndividualProgressionPlayer.cpp
index 1d7273e..a5666fe 100644
--- a/src/IndividualProgressionPlayer.cpp
+++ b/src/IndividualProgressionPlayer.cpp
@@ -330,35 +330,34 @@ public:
     IndividualPlayerProgression_AccountScript() : AccountScript("IndividualProgression_AccountScript")
     {}
 
-    // Waiting for PR: https://github.com/azerothcore/azerothcore-wotlk/pull/13060
-//    bool CanAccountCreateCharacter(uint32 accountId, uint8 charRace, uint8 charClass) override
-//    {
-//        if ((!sIndividualProgression->enabled) ||
-//            (charRace != RACE_DRAENEI && charRace != RACE_BLOODELF && charClass != CLASS_DEATH_KNIGHT) ||
-//            (!sIndividualProgression->tbcRacesProgressionLevel && !sIndividualProgression->deathKnightProgressionLevel))
-//        {
-//            return true;
-//        }
-//        uint8 highestProgression = sIndividualProgression->GetAccountProgression(accountId);
-//        if (charRace == RACE_DRAENEI || charRace == RACE_BLOODELF)
-//        {
-//            if (sIndividualProgression->tbcRacesProgressionLevel)
-//            {
-//                if (highestProgression < sIndividualProgression->tbcRacesProgressionLevel)
-//                {
-//                    return false;
-//                }
-//            }
-//        }
-//        if (charClass == CLASS_DEATH_KNIGHT && sIndividualProgression->deathKnightProgressionLevel)
-//        {
-//            if (highestProgression < sIndividualProgression->deathKnightProgressionLevel)
-//            {
-//                return false;
-//            }
-//        }
-//        return true;
-//    }
+    bool CanAccountCreateCharacter(uint32 accountId, uint8 charRace, uint8 charClass) override
+    {
+        if ((!sIndividualProgression->enabled) ||
+            (charRace != RACE_DRAENEI && charRace != RACE_BLOODELF && charClass != CLASS_DEATH_KNIGHT) ||
+            (!sIndividualProgression->tbcRacesProgressionLevel && !sIndividualProgression->deathKnightProgressionLevel))
+        {
+            return true;
+        }
+        uint8 highestProgression = sIndividualProgression->GetAccountProgression(accountId);
+        if (charRace == RACE_DRAENEI || charRace == RACE_BLOODELF)
+        {
+            if (sIndividualProgression->tbcRacesProgressionLevel)
+            {
+                if (highestProgression < sIndividualProgression->tbcRacesProgressionLevel)
+                {
+                    return false;
+                }
+            }
+        }
+        if (charClass == CLASS_DEATH_KNIGHT && sIndividualProgression->deathKnightProgressionLevel)
+        {
+            if (highestProgression < sIndividualProgression->deathKnightProgressionLevel)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
 };