aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql11
-rwxr-xr-xsrc/server/game/Achievements/AchievementMgr.cpp8
2 files changed, 11 insertions, 8 deletions
diff --git a/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql b/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..f5df93c3bd1
--- /dev/null
+++ b/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql
@@ -0,0 +1,11 @@
+-- Achievement Fa-la-la-la-Ogri'la
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3936,3937,3938);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+-- requires aura
+(3936, 5, 44827, 0, ''),
+(3937, 5, 44825, 0, ''),
+(3938, 5, 44824, 0, ''),
+-- requires Holiday Winter Veil
+(3936, 16, 141, 0, ''),
+(3937, 16, 141, 0, ''),
+(3938, 16, 141, 0, ''); \ No newline at end of file
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 596c85a6075..296224283d3 100755
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1069,14 +1069,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
continue;
}
- if (achievement->ID == 1282)
- {
- // those requirements couldn't be found in the dbc
- AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria);
- if (!data || !data->Meets(GetPlayer(), unit))
- continue;
- }
-
SetCriteriaProgress(achievementCriteria, 1);
break;
}