From be5f0b0f478dec5f9a49680dec24ba0dd1870f63 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 9 Jun 2012 22:50:56 +0200 Subject: Core/Scripts: Fixed crash in mob_phase_hunterAI, this entire script is crappy and needs rewrite anyway. --- src/server/scripts/Outland/netherstorm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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) { -- cgit v1.2.3 From f6fc2ef8cfa6cd67ec6c7595de6b4101d6877385 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 10 Jun 2012 03:28:51 +0200 Subject: Fix non PCH build --- src/server/game/Server/Protocol/PacketLog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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) { -- cgit v1.2.3 From 41d2de2ca3affcc7fbb900a6d7e177960cb569ef Mon Sep 17 00:00:00 2001 From: kandera Date: Sun, 10 Jun 2012 16:10:43 -0300 Subject: Core/Spells: fix addition of unit_state_casting. thx vincent-michael --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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; -- cgit v1.2.3