diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-06-10 21:41:07 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-06-10 21:41:07 -0500 |
| commit | 20b97b011959bd8ae2dbacb99447aa3cb99d6cf6 (patch) | |
| tree | 56cfe41e6b73e94975d3fe69ae69248542964e2f /src | |
| parent | 41b1416445d917e7cce09853829ef9f1a8e632bf (diff) | |
| parent | 41d2de2ca3affcc7fbb900a6d7e177960cb569ef (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/PacketLog.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Outland/netherstorm.cpp | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d133a2b6a38..a99356681e2 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2893,7 +2893,7 @@ void Unit::SetCurrentCastedSpell(Spell* pSpell) InterruptSpell(CURRENT_AUTOREPEAT_SPELL); m_AutoRepeatFirstCast = true; } - if ((pSpell->m_spellInfo->CalcCastTime(this) > 0) && IsNonMeleeSpellCasted(false, false, true)) + if (pSpell->m_spellInfo->CalcCastTime(this) > 0) AddUnitState(UNIT_STATE_CASTING); break; diff --git a/src/server/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp index bede48ace87..a8e184c369a 100644 --- a/src/server/game/Server/Protocol/PacketLog.cpp +++ b/src/server/game/Server/Protocol/PacketLog.cpp @@ -18,6 +18,7 @@ #include "PacketLog.h" #include "Config.h" #include "ByteBuffer.h" +#include "WorldPacket.h" PacketLog::PacketLog() : _file(NULL) { diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index afc18c71b92..16dac13d1a9 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -777,10 +777,10 @@ public: PlayerGUID = who->GetGUID(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) - { - DoCast(me, SPELL_DE_MATERIALIZE); - } + //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) + //{ + // DoCast(me, SPELL_DE_MATERIALIZE); + //} void UpdateAI(const uint32 diff) { |