diff options
| author | maximius <none@none> | 2009-10-15 08:34:19 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-15 08:34:19 -0700 |
| commit | 7caac8a80554b4cc6cdc1e64b826a90901d4bbf6 (patch) | |
| tree | c45ec67a1ed8f7295ddb5867e3a259882080b930 | |
| parent | 1319312af1a2b22edd7f63936226ba63581b9d22 (diff) | |
*Fix some typos in trinitycore.conf.dist
*Fix Enduring Winter not increasing water elemental duration, by Cleave
--HG--
branch : trunk
| -rw-r--r-- | src/game/SpellEffects.cpp | 3 | ||||
| -rw-r--r-- | src/trinitycore/Main.cpp | 2 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 573ff7acfcb..27c65113f39 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -7094,6 +7094,9 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const * break; } int32 duration = GetSpellDuration(m_spellInfo); + if(Player* modOwner = m_originalCaster->GetSpellModOwner()) + modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); + TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN; Map *map = caster->GetMap(); diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index 64ebdfa1bb8..3bcbb02b9d7 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -40,7 +40,7 @@ // Format is YYYYMMDDRR where RR is the change in the conf file // for that day. #ifndef _TRINITY_CORE_CONFVER -# define _TRINITY_CORE_CONFVER 2009100601 +# define _TRINITY_CORE_CONFVER 2009101501 #endif //_TRINITY_CORE_CONFVER #ifdef WIN32 diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 04cb3ca29c2..4c9d6d0de63 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1925,7 +1925,7 @@ Ra.Secure = 1 # Defines the amount of honor points that should be given to the team for damaging a tower. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. # # OutdoorPvP.Wintergrasp.CustomHonorDestroyedTower -# Defines the amount of honor points that should be given fto the team or destroying a tower. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Defines the amount of honor points that should be given to the team for destroying a tower. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. # # OutdoorPvP.Wintergrasp.CustomHonorDamagedBuilding # Defines the amount of honor points that should be given to the team for damaged buildings after the battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. |