diff options
5 files changed, 15 insertions, 1 deletions
diff --git a/sql/updates/world/2014_08_29_00_world_creature_template.sql b/sql/updates/world/2014_08_29_00_world_creature_template.sql new file mode 100644 index 00000000000..da298a0f6c5 --- /dev/null +++ b/sql/updates/world/2014_08_29_00_world_creature_template.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `faction`=834 WHERE `entry` IN (40681,40682,40683,40684); +UPDATE `creature_template` SET `faction`=14 WHERE `entry` IN (38285,38788,38789,38790); +UPDATE `creature_template` SET `faction`=21 WHERE `entry` IN (38184,38185); diff --git a/sql/updates/world/2014_08_29_01_world_creature_template.sql b/sql/updates/world/2014_08_29_01_world_creature_template.sql new file mode 100644 index 00000000000..4c4101d0c83 --- /dev/null +++ b/sql/updates/world/2014_08_29_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Adds trigger and civilian flags_extra to Halion's Soul Consumption triggers +UPDATE `creature_template` SET `flags_extra` = `flags_extra` |2|128 WHERE `entry` IN (40673, 40674, 40675); diff --git a/sql/updates/world/2014_08_29_02_world_creature_template.sql b/sql/updates/world/2014_08_29_02_world_creature_template.sql new file mode 100644 index 00000000000..2b151714e97 --- /dev/null +++ b/sql/updates/world/2014_08_29_02_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction`=534 WHERE `entry` IN (37580,37614,37576,37615,37575,37617,37572,37616); +UPDATE `creature_template` SET `faction`=35 WHERE `entry` IN (37813,38402,38582,38583); diff --git a/sql/updates/world/2014_08_29_03_world_creature_template.sql b/sql/updates/world/2014_08_29_03_world_creature_template.sql new file mode 100644 index 00000000000..7c057c8dc85 --- /dev/null +++ b/sql/updates/world/2014_08_29_03_world_creature_template.sql @@ -0,0 +1,5 @@ +-- +UPDATE `creature_template` SET `faction`=1692 WHERE `entry` IN (33139,34111); +UPDATE `creature_template` SET `faction`=16 WHERE `entry` IN(32908,33151,32907,33150,32885,33153,32883,33152,32882,33154); +UPDATE `creature_template` SET `faction`=1814 WHERE `entry` IN (29098,31602,29096,31590,29062,31589); +UPDATE `creature_template` SET `faction`=14 WHERE `entry` IN (29153,31585); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a4de6a935f7..71a7f4b160e 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15322,7 +15322,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, bool rewarded = (m_RewardedQuests.find(quest_id) != m_RewardedQuests.end()); // Not give XP in case already completed once repeatable quest - uint32 XP = rewarded ? 0 : uint32(quest->XPValue(this)*sWorld->getRate(RATE_XP_QUEST)); + uint32 XP = rewarded && !quest->IsDFQuest() ? 0 : uint32(quest->XPValue(this)*sWorld->getRate(RATE_XP_QUEST)); // handle SPELL_AURA_MOD_XP_QUEST_PCT auras Unit::AuraEffectList const& ModXPPctAuras = GetAuraEffectsByType(SPELL_AURA_MOD_XP_QUEST_PCT); |