feat(Core): improved some hooks (#6302)

2026-01-18 11:25:42 +00:00 · 2021-06-13 10:23:24 +02:00
parent 806dc4052f
commit baf437bb98
43 changed files with 162 additions and 93 deletions
--- a/src/server/scripts/Events/pilgrims_bounty.cpp
+++ b/src/server/scripts/Events/pilgrims_bounty.cpp
@@ -671,7 +671,7 @@ class achievement_pb_pilgrims_peril : public AchievementCriteriaScript
 public:
    achievement_pb_pilgrims_peril() : AchievementCriteriaScript("achievement_pb_pilgrims_peril") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_DRESS, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ROBE, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ATTIRE, 1))
            return true;
@@ -685,7 +685,7 @@ class achievement_pb_terokkar_turkey_time : public AchievementCriteriaScript
 public:
    achievement_pb_terokkar_turkey_time() : AchievementCriteriaScript("achievement_pb_terokkar_turkey_time") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_HAT, 1) && (source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_DRESS, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ROBE, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ATTIRE, 1)))
            return true;
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -381,7 +381,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -222,7 +222,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
@@ -204,7 +204,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -342,7 +342,7 @@ class achievement_oh_novos : public AchievementCriteriaScript
 public:
    achievement_oh_novos() : AchievementCriteriaScript("achievement_oh_novos") { }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetAI()->GetData(target->GetEntry());
    }
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -253,7 +253,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -265,7 +265,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -193,7 +193,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetDisplayId() == target->GetNativeDisplayId();
    }
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -223,7 +223,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -972,7 +972,7 @@ class achievement_once_bitten_twice_shy : public AchievementCriteriaScript
 public:
    achievement_once_bitten_twice_shy(const char* name, uint8 spawnMode, bool wasVampire) : AchievementCriteriaScript(name), _spawnMode(spawnMode), _wasVampire(wasVampire) { }

-    bool OnCheck(Player* source, Unit* target) override
+    bool OnCheck(Player* source, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target || !target->FindMap())
            return false;
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -1335,7 +1335,7 @@ class achievement_ive_gone_and_made_a_mess : public AchievementCriteriaScript
 public:
    achievement_ive_gone_and_made_a_mess() : AchievementCriteriaScript("achievement_ive_gone_and_made_a_mess") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (Creature* saurfang = target->ToCreature())
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -399,7 +399,7 @@ class achievement_flu_shot_shortage : public AchievementCriteriaScript
 public:
    achievement_flu_shot_shortage() : AchievementCriteriaScript("achievement_flu_shot_shortage") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target && target->GetTypeId() == TYPEID_UNIT)
            return target->ToCreature()->AI()->GetData(DATA_INOCULATED_STACK) < 3;
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -2694,7 +2694,7 @@ class achievement_im_on_a_boat : public AchievementCriteriaScript
 public:
    achievement_im_on_a_boat() : AchievementCriteriaScript("achievement_im_on_a_boat") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target->GetAI() && target->GetAI()->GetData(ACTION_SHIP_VISITS_ENEMY) == 1;
    }
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1351,7 +1351,7 @@ class achievement_all_you_can_eat : public AchievementCriteriaScript
 public:
    achievement_all_you_can_eat() : AchievementCriteriaScript("achievement_all_you_can_eat") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target || target->GetEntry() != NPC_SINDRAGOSA)
            return false;
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -3742,7 +3742,7 @@ class achievement_been_waiting_long_time : public AchievementCriteriaScript
 public:
    achievement_been_waiting_long_time() : AchievementCriteriaScript("achievement_been_waiting_long_time") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
@@ -3756,7 +3756,7 @@ class achievement_neck_deep_in_vile : public AchievementCriteriaScript
 public:
    achievement_neck_deep_in_vile() : AchievementCriteriaScript("achievement_neck_deep_in_vile") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -1489,7 +1489,7 @@ class achievement_portal_jockey : public AchievementCriteriaScript
 public:
    achievement_portal_jockey() : AchievementCriteriaScript("achievement_portal_jockey") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_VALITHRIA_DREAMWALKER && !target->GetAI()->GetData(MISSED_PORTALS);
    }
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -196,7 +196,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -186,7 +186,7 @@ public:
    {
    }

-    bool OnCheck(Player* player, Unit* target) override
+    bool OnCheck(Player* player, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -318,7 +318,7 @@ public:
    {
    }

-    bool OnCheck(Player* /*player*/, Unit* target) override
+    bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
@@ -1398,7 +1398,7 @@ class achievement_algalon_he_feeds_on_your_tears : public AchievementCriteriaScr
 public:
    achievement_algalon_he_feeds_on_your_tears() : AchievementCriteriaScript("achievement_algalon_he_feeds_on_your_tears") { }

-    bool OnCheck(Player*, Unit* target /*Algalon*/) override
+    bool OnCheck(Player*, Unit* target /*Algalon*/, uint32 /*criteria_id*/) override
    {
        return target && target->GetAI()->GetData(DATA_HAS_FED_ON_TEARS);
    }
@@ -1409,7 +1409,7 @@ class achievement_algalon_herald_of_the_titans : public AchievementCriteriaScrip
 public:
    achievement_algalon_herald_of_the_titans() : AchievementCriteriaScript("achievement_algalon_herald_of_the_titans") { }

-    bool OnCheck(Player*, Unit* target /*Algalon*/) override
+    bool OnCheck(Player*, Unit* target /*Algalon*/, uint32 /*criteria_id*/) override
    {
        return target && target->GetAI()->GetData(DATA_HERALD_OF_THE_TITANS);
    }
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
@@ -928,7 +928,7 @@ public:
    {
    }

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetAuraCount(SPELL_SUPERCHARGE) >= 2 && (!_targetEntry || target->GetEntry() == _targetEntry);
    }
@@ -942,7 +942,7 @@ class achievement_cant_do_that_while_stunned : public AchievementCriteriaScript
 public:
    achievement_cant_do_that_while_stunned() : AchievementCriteriaScript("achievement_cant_do_that_while_stunned") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        bool allow = target && target->GetAuraCount(SPELL_SUPERCHARGE) >= 2;
        if (!allow)
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -460,7 +460,7 @@ class achievement_auriaya_crazy_cat_lady : public AchievementCriteriaScript
 public:
    achievement_auriaya_crazy_cat_lady() : AchievementCriteriaScript("achievement_auriaya_crazy_cat_lady") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
@@ -476,7 +476,7 @@ class achievement_auriaya_nine_lives : public AchievementCriteriaScript
 public:
    achievement_auriaya_nine_lives() : AchievementCriteriaScript("achievement_auriaya_nine_lives") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -2076,7 +2076,7 @@ public:
    {
    }

-    bool OnCheck(Player*  /*player*/, Unit* target /*Flame Leviathan*/) override
+    bool OnCheck(Player*  /*player*/, Unit* target /*Flame Leviathan*/, uint32 /*criteria_id*/) override
    {
        return target && _towerCount <= target->GetAI()->GetData(DATA_GET_TOWER_COUNT);
    }
@@ -2090,7 +2090,7 @@ class achievement_flame_leviathan_shutout : public AchievementCriteriaScript
 public:
    achievement_flame_leviathan_shutout() : AchievementCriteriaScript("achievement_flame_leviathan_shutout") {}

-    bool OnCheck(Player*  /*player*/, Unit* target /*Flame Leviathan*/) override
+    bool OnCheck(Player*  /*player*/, Unit* target /*Flame Leviathan*/, uint32 /*criteria_id*/) override
    {
        if (target)
            if (target->GetAI()->GetData(DATA_GET_SHUTDOWN))
@@ -2107,7 +2107,7 @@ public:
    {
    }

-    bool OnCheck(Player* player, Unit*) override
+    bool OnCheck(Player* player, Unit*, uint32 /*criteria_id*/) override
    {
        if (Vehicle* vehicle = player->GetVehicle())
            if (vehicle->GetCreatureEntry() == _entry1 || vehicle->GetCreatureEntry() == _entry2)
@@ -2125,7 +2125,7 @@ class achievement_flame_leviathan_unbroken : public AchievementCriteriaScript
 public:
    achievement_flame_leviathan_unbroken() : AchievementCriteriaScript("achievement_flame_leviathan_unbroken") {}

-    bool OnCheck(Player* player, Unit*) override
+    bool OnCheck(Player* player, Unit*, uint32 /*criteria_id*/) override
    {
        if (player->GetInstanceScript())
            if (player->GetInstanceScript()->GetData(DATA_UNBROKEN_ACHIEVEMENT))
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -1294,7 +1294,7 @@ class achievement_freya_getting_back_to_nature : public AchievementCriteriaScrip
 public:
    achievement_freya_getting_back_to_nature() : AchievementCriteriaScript("achievement_freya_getting_back_to_nature") {}

-    bool OnCheck(Player*  /*player*/, Unit* target /*Freya*/) override
+    bool OnCheck(Player*  /*player*/, Unit* target /*Freya*/, uint32 /*criteria_id*/) override
    {
        if (target)
            if (target->GetAI()->GetData(DATA_BACK_TO_NATURE))
@@ -1311,7 +1311,7 @@ public:
    {
    }

-    bool OnCheck(Player*  /*player*/, Unit* target /*Freya*/) override
+    bool OnCheck(Player*  /*player*/, Unit* target /*Freya*/, uint32 /*criteria_id*/) override
    {
        return target && _elderCount <= target->GetAI()->GetData(DATA_GET_ELDER_COUNT);
    }
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -644,7 +644,7 @@ class achievement_smell_saronite : public AchievementCriteriaScript
 public:
    achievement_smell_saronite() : AchievementCriteriaScript("achievement_smell_saronite") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_VEZAX && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(1);
    }
@@ -655,7 +655,7 @@ class achievement_shadowdodger : public AchievementCriteriaScript
 public:
    achievement_shadowdodger() : AchievementCriteriaScript("achievement_shadowdodger") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_VEZAX && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(2);
    }
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -1449,7 +1449,7 @@ class achievement_cheese_the_freeze : public AchievementCriteriaScript
 public:
    achievement_cheese_the_freeze() : AchievementCriteriaScript("achievement_cheese_the_freeze") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(1);
    }
@@ -1460,7 +1460,7 @@ class achievement_getting_cold_in_here : public AchievementCriteriaScript
 public:
    achievement_getting_cold_in_here() : AchievementCriteriaScript("achievement_getting_cold_in_here") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(2);
    }
@@ -1471,7 +1471,7 @@ class achievement_i_could_say_that_this_cache_was_rare : public AchievementCrite
 public:
    achievement_i_could_say_that_this_cache_was_rare() : AchievementCriteriaScript("achievement_i_could_say_that_this_cache_was_rare") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(3);
    }
@@ -1482,7 +1482,7 @@ class achievement_i_have_the_coolest_friends : public AchievementCriteriaScript
 public:
    achievement_i_have_the_coolest_friends() : AchievementCriteriaScript("achievement_i_have_the_coolest_friends") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(4);
    }
@@ -1493,7 +1493,7 @@ class achievement_staying_buffed_all_winter_10 : public AchievementCriteriaScrip
 public:
    achievement_staying_buffed_all_winter_10() : AchievementCriteriaScript("achievement_staying_buffed_all_winter_10") {}

-    bool OnCheck(Player* player, Unit*  /*target*/) override
+    bool OnCheck(Player* player, Unit*  /*target*/, uint32 /*criteria_id*/) override
    {
        return player && player->HasAura(SPELL_MAGE_TOASTY_FIRE_AURA) && player->HasAura(SPELL_DRUID_STARLIGHT_AREA_AURA) && player->HasAura(SPELL_SHAMAN_STORM_POWER_10);
    }
@@ -1504,7 +1504,7 @@ class achievement_staying_buffed_all_winter_25 : public AchievementCriteriaScrip
 public:
    achievement_staying_buffed_all_winter_25() : AchievementCriteriaScript("achievement_staying_buffed_all_winter_25") {}

-    bool OnCheck(Player* player, Unit*  /*target*/) override
+    bool OnCheck(Player* player, Unit*  /*target*/, uint32 /*criteria_id*/) override
    {
        return player && player->HasAura(SPELL_MAGE_TOASTY_FIRE_AURA) && player->HasAura(SPELL_DRUID_STARLIGHT_AREA_AURA) && player->HasAura(SPELL_SHAMAN_STORM_POWER_25);
    }
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
@@ -551,7 +551,7 @@ class achievement_ignis_shattered : public AchievementCriteriaScript
 public:
    achievement_ignis_shattered() : AchievementCriteriaScript("achievement_ignis_shattered") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target || target->GetTypeId() != TYPEID_UNIT)
            return false;
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -813,7 +813,7 @@ class achievement_kologarn_looks_could_kill : public AchievementCriteriaScript
 public:
    achievement_kologarn_looks_could_kill() : AchievementCriteriaScript("achievement_kologarn_looks_could_kill") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
@@ -829,7 +829,7 @@ class achievement_kologarn_rubble_and_roll : public AchievementCriteriaScript
 public:
    achievement_kologarn_rubble_and_roll() : AchievementCriteriaScript("achievement_kologarn_rubble_and_roll") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
@@ -845,7 +845,7 @@ class achievement_kologarn_with_open_arms : public AchievementCriteriaScript
 public:
    achievement_kologarn_with_open_arms() : AchievementCriteriaScript("achievement_kologarn_with_open_arms") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -2523,7 +2523,7 @@ class achievement_mimiron_firefighter : public AchievementCriteriaScript
 public:
    achievement_mimiron_firefighter() : AchievementCriteriaScript("achievement_mimiron_firefighter") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(1);
    }
@@ -2534,7 +2534,7 @@ class achievement_mimiron_set_up_us_the_bomb_11 : public AchievementCriteriaScri
 public:
    achievement_mimiron_set_up_us_the_bomb_11() : AchievementCriteriaScript("achievement_mimiron_set_up_us_the_bomb_11") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && !target->ToCreature()->AI()->GetData(11);
    }
@@ -2545,7 +2545,7 @@ class achievement_mimiron_set_up_us_the_bomb_12 : public AchievementCriteriaScri
 public:
    achievement_mimiron_set_up_us_the_bomb_12() : AchievementCriteriaScript("achievement_mimiron_set_up_us_the_bomb_12") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && !target->ToCreature()->AI()->GetData(12);
    }
@@ -2556,7 +2556,7 @@ class achievement_mimiron_set_up_us_the_bomb_13 : public AchievementCriteriaScri
 public:
    achievement_mimiron_set_up_us_the_bomb_13() : AchievementCriteriaScript("achievement_mimiron_set_up_us_the_bomb_13") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && !target->ToCreature()->AI()->GetData(13);
    }
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -1096,7 +1096,7 @@ class achievement_quick_shave : public AchievementCriteriaScript
 public:
    achievement_quick_shave() : AchievementCriteriaScript("achievement_quick_shave") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetTypeId() == TYPEID_UNIT && target->GetEntry() == NPC_RAZORSCALE && target->ToCreature()->AI()->GetData(1);
    }
@@ -1107,7 +1107,7 @@ class achievement_iron_dwarf_medium_rare : public AchievementCriteriaScript
 public:
    achievement_iron_dwarf_medium_rare() : AchievementCriteriaScript("achievement_iron_dwarf_medium_rare") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_RAZORSCALE;
    }
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -1802,7 +1802,7 @@ class achievement_thorim_stand_in_the_lightning : public AchievementCriteriaScri
 public:
    achievement_thorim_stand_in_the_lightning() : AchievementCriteriaScript("achievement_thorim_stand_in_the_lightning") {}

-    bool OnCheck(Player* player, Unit*) override
+    bool OnCheck(Player* player, Unit*, uint32 /*criteria_id*/) override
    {
        if (InstanceScript* instance = player->GetInstanceScript())
            if (Creature* cr = ObjectAccessor::GetCreature(*player, instance->GetGuidData(TYPE_THORIM)))
@@ -1817,7 +1817,7 @@ class achievement_thorim_lose_your_illusion : public AchievementCriteriaScript
 public:
    achievement_thorim_lose_your_illusion() : AchievementCriteriaScript("achievement_thorim_lose_your_illusion") {}

-    bool OnCheck(Player* player, Unit*) override
+    bool OnCheck(Player* player, Unit*, uint32 /*criteria_id*/) override
    {
        if (InstanceScript* instance = player->GetInstanceScript())
            if (Creature* cr = ObjectAccessor::GetCreature(*player, instance->GetGuidData(TYPE_THORIM)))
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -1043,7 +1043,7 @@ class achievement_xt002_nerf_engineering : public AchievementCriteriaScript
 public:
    achievement_xt002_nerf_engineering() : AchievementCriteriaScript("achievement_xt002_nerf_engineering") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
@@ -1059,7 +1059,7 @@ class achievement_xt002_nerf_gravity_bombs : public AchievementCriteriaScript
 public:
    achievement_xt002_nerf_gravity_bombs() : AchievementCriteriaScript("achievement_xt002_nerf_gravity_bombs") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (target)
            if (InstanceScript* instance = target->GetInstanceScript())
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
@@ -2955,7 +2955,7 @@ class achievement_yogg_saron_drive_me_crazy : public AchievementCriteriaScript
 public:
    achievement_yogg_saron_drive_me_crazy() : AchievementCriteriaScript("achievement_yogg_saron_drive_me_crazy") {}

-    bool OnCheck(Player*  /*player*/, Unit* target) override
+    bool OnCheck(Player*  /*player*/, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && target->GetAI()->GetData(DATA_GET_DRIVE_ME_CRAZY); // target = Yogg-Saron
    }
@@ -2969,7 +2969,7 @@ public:
    {
    }

-    bool OnCheck(Player* player, Unit*  /*target*/ /*Yogg-Saron*/) override
+    bool OnCheck(Player* player, Unit*  /*target*/ /*Yogg-Saron*/, uint32 /*criteria_id*/) override
    {
        if (player->GetInstanceScript())
            if (Creature* sara = ObjectAccessor::GetCreature(*player, player->GetInstanceScript()->GetGuidData(NPC_SARA)))
@@ -2990,7 +2990,7 @@ public:
    {
    }

-    bool OnCheck(Player* player, Unit*  /*target*/ /*Yogg-Saron*/) override
+    bool OnCheck(Player* player, Unit*  /*target*/ /*Yogg-Saron*/, uint32 /*criteria_id*/) override
    {
        if (player->GetInstanceScript())
            if (Creature* sara = ObjectAccessor::GetCreature(*player, player->GetInstanceScript()->GetGuidData(NPC_BRAIN_OF_YOGG_SARON)))
@@ -3008,7 +3008,7 @@ class achievement_yogg_saron_kiss_and_make_up : public AchievementCriteriaScript
 public:
    achievement_yogg_saron_kiss_and_make_up() : AchievementCriteriaScript("achievement_yogg_saron_kiss_and_make_up") {}

-    bool OnCheck(Player*  /*player*/, Unit* target /*Sara*/) override
+    bool OnCheck(Player*  /*player*/, Unit* target /*Sara*/, uint32 /*criteria_id*/) override
    {
        return target && target->GetEntry() == NPC_SARA && target->GetAI() && target->GetAI()->GetData(DATA_GET_SARA_PHASE);
    }
--- a/src/server/scripts/Northrend/zone_wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
@@ -1045,7 +1045,7 @@ class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript
 public:
    achievement_wg_didnt_stand_a_chance() : AchievementCriteriaScript("achievement_wg_didnt_stand_a_chance") { }

-    bool OnCheck(Player* source, Unit* target) override
+    bool OnCheck(Player* source, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
@@ -1069,7 +1069,7 @@ class achievement_wg_vehicular_gnomeslaughter : public AchievementCriteriaScript
 public:
    achievement_wg_vehicular_gnomeslaughter() : AchievementCriteriaScript("achievement_wg_vehicular_gnomeslaughter") { }

-    bool OnCheck(Player* source, Unit* target) override
+    bool OnCheck(Player* source, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
@@ -1089,7 +1089,7 @@ class achievement_wg_within_our_grasp : public AchievementCriteriaScript
 public:
    achievement_wg_within_our_grasp() : AchievementCriteriaScript("achievement_wg_within_our_grasp") { }

-    bool OnCheck(Player*  /*source*/, Unit*  /*target*/) override
+    bool OnCheck(Player*  /*source*/, Unit*  /*target*/, uint32 /*criteria_id*/) override
    {
        Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
        if (!wintergrasp)
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -19,7 +19,7 @@ class achievement_resilient_victory : public AchievementCriteriaScript
 public:
    achievement_resilient_victory() : AchievementCriteriaScript("achievement_resilient_victory") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        Battleground* bg = source->GetBattleground();
        return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AB && bg->ToBattlegroundAB()->IsTeamScores500Disadvantage(source->GetTeamId());
@@ -31,7 +31,7 @@ class achievement_bg_control_all_nodes : public AchievementCriteriaScript
 public:
    achievement_bg_control_all_nodes() : AchievementCriteriaScript("achievement_bg_control_all_nodes") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        Battleground* bg = source->GetBattleground();
        return bg && bg->AllNodesConrolledByTeam(source->GetTeamId());
@@ -43,7 +43,7 @@ class achievement_save_the_day : public AchievementCriteriaScript
 public:
    achievement_save_the_day() : AchievementCriteriaScript("achievement_save_the_day") { }

-    bool OnCheck(Player* source, Unit* target) override
+    bool OnCheck(Player* source, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
@@ -62,7 +62,7 @@ class achievement_bg_ic_resource_glut : public AchievementCriteriaScript
 public:
    achievement_bg_ic_resource_glut() : AchievementCriteriaScript("achievement_bg_ic_resource_glut") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        Battleground* bg = source->GetBattleground();
        return bg && bg->GetBgTypeID(true) == BATTLEGROUND_IC && bg->ToBattlegroundIC()->IsResourceGlutAllowed(source->GetTeamId());
@@ -74,7 +74,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript
 public:
    achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (Creature* vehicle = source->GetVehicleCreatureBase())
            return vehicle->GetEntry() == NPC_GLAIVE_THROWER_H ||  vehicle->GetEntry() == NPC_GLAIVE_THROWER_A;
@@ -88,7 +88,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript
 public:
    achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (Creature* vehicle = source->GetVehicleCreatureBase())
            return vehicle->GetEntry() == NPC_KEEP_CANNON;
@@ -102,7 +102,7 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript
 public:
    achievement_bg_sa_artillery() : AchievementCriteriaScript("achievement_bg_sa_artillery") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (Creature* vehicle = source->GetVehicleCreatureBase())
            return vehicle->GetEntry() == NPC_ANTI_PERSONNAL_CANNON;
@@ -119,7 +119,7 @@ public:
    {
    }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        return source->InArena() && source->GetBattleground()->GetArenaType() == _arenaType;
    }
@@ -133,7 +133,7 @@ class achievement_sickly_gazelle : public AchievementCriteriaScript
 public:
    achievement_sickly_gazelle() : AchievementCriteriaScript("achievement_sickly_gazelle") { }

-    bool OnCheck(Player* /*source*/, Unit* target) override
+    bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
    {
        if (!target)
            return false;
@@ -151,7 +151,7 @@ class achievement_everything_counts : public AchievementCriteriaScript
 public:
    achievement_everything_counts() : AchievementCriteriaScript("achievement_everything_counts") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        Battleground* bg = source->GetBattleground();
        return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AV && bg->ToBattlegroundAV()->IsBothMinesControlledByTeam(source->GetTeamId());
@@ -163,7 +163,7 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript
 public:
    achievement_bg_av_perfection() : AchievementCriteriaScript("achievement_bg_av_perfection") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        Battleground* bg = source->GetBattleground();
        return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AV && bg->ToBattlegroundAV()->IsAllTowersControlledAndCaptainAlive(source->GetTeamId());
@@ -175,7 +175,7 @@ class achievement_sa_defense_of_the_ancients : public AchievementCriteriaScript
 public:
    achievement_sa_defense_of_the_ancients() : AchievementCriteriaScript("achievement_sa_defense_of_the_ancients") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        Battleground* bg = source->GetBattleground();
        return bg && bg->GetBgTypeID(true) == BATTLEGROUND_SA && bg->ToBattlegroundSA()->AllowDefenseOfTheAncients(source);
@@ -197,7 +197,7 @@ class achievement_tilted : public AchievementCriteriaScript
 public:
    achievement_tilted() : AchievementCriteriaScript("achievement_tilted") {}

-    bool OnCheck(Player* player, Unit* /*target*/) override
+    bool OnCheck(Player* player, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (!player)
            return false;
@@ -219,7 +219,7 @@ class achievement_not_even_a_scratch : public AchievementCriteriaScript
 public:
    achievement_not_even_a_scratch() : AchievementCriteriaScript("achievement_not_even_a_scratch") { }

-    bool OnCheck(Player* source, Unit* /*target*/) override
+    bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
    {
        if (!source)
            return false;
@@ -234,7 +234,7 @@ class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript
 public:
    achievement_killed_exp_or_honor_target() : AchievementCriteriaScript("achievement_killed_exp_or_honor_target") { }

-    bool OnCheck(Player* player, Unit* target) override
+    bool OnCheck(Player* player, Unit* target, uint32 /*criteria_id*/) override
    {
        return target && player->isHonorOrXPTarget(target);
    }