Merge pull request #4216 from Studioworks/master

Core/Misc: Fix some copy&paste mistakes in creature_(template_)addon. Also added missing data in player_factionchange_achievement table

3 files changed, 76 insertions, 5 deletions

diff --git a/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql b/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql
new file mode 100644
index 00000000000..7a19fa2cad0
--- /dev/null
+++ b/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql
@@ -0,0 +1,71 @@
+-- Missing achievement data (checked via DBC files)
+DELETE FROM `player_factionchange_achievement` WHERE `alliance_id` IN (35,41,58,202,206,220,225,230,246,388,433,434,435,436,437,438,439,440,441,442,470,471,472,473,707,764,907,908,1167,1169,1172,1262,1466,1563,1681,1737,1752,1757,1762,1782,2016,2194,2536,2760,2761,2762,2763,2764,2770,2777,2778,2779,2780,2781,2782,2817,3356,3478,3676,3846,3851,3856,3857,4156,4296,4298,4784,4786);
+INSERT INTO `player_factionchange_achievement` (`alliance_id`,`horde_id`) VALUES
+(35,1359),
+(41,1360),
+(58,593),
+(202,1502),
+(206,1252),
+(220,873),
+(225,1164),
+(230,1175),
+(246,1005),
+(388,1006),
+(433,443),
+(434,445),
+(435,444),
+(436,447),
+(437,448),
+(438,469),
+(439,451),
+(440,452),
+(441,450),
+(442,454),
+(470,468),
+(471,453),
+(472,449),
+(473,446),
+(707,706),
+(764,763),
+(907,714),
+(908,909),
+(1167,1168),
+(1169,1170),
+(1172,1173),
+(1262,1274),
+(1466,926),
+(1563,1784),
+(1681,1682),
+(1737,2476),
+(1752,2776),
+(1757,2200),
+(1762,2192),
+(1782,1783),
+(2016,2017),
+(2194,2195),
+(2536,2537),
+(2760,2768),
+(2761,2767),
+(2762,2766),
+(2763,2769),
+(2764,2765),
+(2770,2771),
+(2777,2786),
+(2778,2785),
+(2779,2784),
+(2780,2787),
+(2781,2783),
+(2782,2788),
+(2817,2816),
+(3356,3357),
+(3478,3656),
+(3676,3677),
+(3846,4176),
+(3851,4177),
+(3856,4256),
+(3857,3957),
+(4156,4079),
+(4296,3778),
+(4298,4297),
+(4784,4785),
+(4786,4790);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index be61a9bbe59..75573367241 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -535,7 +535,7 @@ void ObjectMgr::LoadCreatureTemplateAddons()
 
     if (!result)
     {
-        sLog->outString(">> Loaded 0 creature template addon definitions. DB table `creature_addon` is empty.");
+        sLog->outString(">> Loaded 0 creature template addon definitions. DB table `creature_template_addon` is empty.");
         sLog->outString();
         return;
     }
@@ -569,7 +569,7 @@ void ObjectMgr::LoadCreatureTemplateAddons()
             SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
             if (!AdditionalSpellInfo)
             {
-                sLog->outErrorDb("Creature (GUID: %u) has wrong spell %u defined in `auras` field in `creature_addon`.", entry, uint32(atol(*itr)));
+                sLog->outErrorDb("Creature (Entry: %u) has wrong spell %u defined in `auras` field in `creature_template_addon`.", entry, uint32(atol(*itr)));
                 continue;
             }
             creatureAddon.auras[i++] = uint32(atol(*itr));
@@ -579,13 +579,13 @@ void ObjectMgr::LoadCreatureTemplateAddons()
         {
             if (!sCreatureDisplayInfoStore.LookupEntry(creatureAddon.mount))
             {
-                sLog->outErrorDb("Creature (GUID: %u) has invalid displayInfoId (%u) for mount defined in `creature_addon`", entry, creatureAddon.mount);
+                sLog->outErrorDb("Creature (Entry: %u) has invalid displayInfoId (%u) for mount defined in `creature_template_addon`", entry, creatureAddon.mount);
                 creatureAddon.mount = 0;
             }
         }
 
         if (!sEmotesStore.LookupEntry(creatureAddon.emote))
-            sLog->outErrorDb("Creature (GUID: %u) has invalid emote (%u) defined in `creature_addon`.", entry, creatureAddon.emote);
+            sLog->outErrorDb("Creature (Entry: %u) has invalid emote (%u) defined in `creature_template_addon`.", entry, creatureAddon.emote);
 
         ++count;
     }
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 8aca4563b91..a139c50fb3e 100755
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1387,7 +1387,7 @@ void World::SetInitialWorldSettings()
     sLog->outString("Loading pet default spells additional to levelup spells...");
     sSpellMgr->LoadPetDefaultSpells();
 
-    sLog->outString("Loading Creature Template Addon Data...");
+    sLog->outString("Loading Creature Addon Data...");
     sObjectMgr->LoadCreatureAddons();                            // must be after LoadCreatureTemplates() and LoadCreatures()
 
     sLog->outString("Loading Creature Respawn Data...");         // must be after PackInstances()