Corrected some logic in my recent commits.

kaelima · kaelima · commit 398299084ef4 · 2011-12-22T18:48:06.000+01:00
- ff2dbfc thanks LihO - 6ccf95a thanks frostmourne
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
@@ -3483,7 +3483,7 @@ void Spell::update(uint32 difftime)
     {
         case SPELL_STATE_PREPARING:
         {
-            if (m_timer)
+            if (m_timer > 0)
             {
                 if (difftime >= (uint32)m_timer)
                     m_timer = 0;
@@ -3498,7 +3498,7 @@ void Spell::update(uint32 difftime)
         }
         case SPELL_STATE_CASTING:
         {
-            if (m_timer > 0)
+            if (m_timer)
             {
                 // check if there are alive targets left
                 if (!UpdateChanneledTargetList())
@@ -3508,10 +3508,13 @@ void Spell::update(uint32 difftime)
                     finish();
                 }
 
-                if (difftime >= (uint32)m_timer)
-                    m_timer = 0;
-                else
-                    m_timer -= difftime;
+                if (m_timer > 0)
+                {
+                    if (difftime >= (uint32)m_timer)
+                        m_timer = 0;
+                    else
+                        m_timer -= difftime;
+                }
             }
 
             if (m_timer == 0)
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -840,7 +840,7 @@ class boss_hunter_toc5 : public CreatureScript
                 {
                     DoCast(target, SPELL_MULTI_SHOT);
                 }
-                else if (target)
+                else
                 {
                     Map::PlayerList const& players = me->GetMap()->GetPlayers();
                     if (me->GetMap()->IsDungeon() && !players.isEmpty())
@@ -850,7 +850,7 @@ class boss_hunter_toc5 : public CreatureScript
                             Player* player = itr->getSource();
                             if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false))
                             {
-                                DoCast(target, SPELL_MULTI_SHOT);
+                                DoCast(player, SPELL_MULTI_SHOT);
                                 break;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -3483,7 +3483,7 @@ void Spell::update(uint32 difftime)`
`3483`	`3483`	`{`
`3484`	`3484`	`case SPELL_STATE_PREPARING:`
`3485`	`3485`	`{`
`3486`		`- if (m_timer)`
	`3486`	`+ if (m_timer > 0)`
`3487`	`3487`	`{`
`3488`	`3488`	`if (difftime >= (uint32)m_timer)`
`3489`	`3489`	`m_timer = 0;`
`@@ -3498,7 +3498,7 @@ void Spell::update(uint32 difftime)`
`3498`	`3498`	`}`
`3499`	`3499`	`case SPELL_STATE_CASTING:`
`3500`	`3500`	`{`
`3501`		`- if (m_timer > 0)`
	`3501`	`+ if (m_timer)`
`3502`	`3502`	`{`
`3503`	`3503`	`// check if there are alive targets left`
`3504`	`3504`	`if (!UpdateChanneledTargetList())`
`@@ -3508,10 +3508,13 @@ void Spell::update(uint32 difftime)`
`3508`	`3508`	`finish();`
`3509`	`3509`	`}`
`3510`	`3510`
`3511`		`- if (difftime >= (uint32)m_timer)`
`3512`		`- m_timer = 0;`
`3513`		`- else`
`3514`		`- m_timer -= difftime;`
	`3511`	`+ if (m_timer > 0)`
	`3512`	`+ {`
	`3513`	`+ if (difftime >= (uint32)m_timer)`
	`3514`	`+ m_timer = 0;`
	`3515`	`+ else`
	`3516`	`+ m_timer -= difftime;`
	`3517`	`+ }`
`3515`	`3518`	`}`
`3516`	`3519`
`3517`	`3520`	`if (m_timer == 0)`
Original file line number	Diff line number	Diff line change
`@@ -840,7 +840,7 @@ class boss_hunter_toc5 : public CreatureScript`
`840`	`840`	`{`
`841`	`841`	`DoCast(target, SPELL_MULTI_SHOT);`
`842`	`842`	`}`
`843`		`- else if (target)`
	`843`	`+ else`
`844`	`844`	`{`
`845`	`845`	`Map::PlayerList const& players = me->GetMap()->GetPlayers();`
`846`	`846`	`if (me->GetMap()->IsDungeon() && !players.isEmpty())`
`@@ -850,7 +850,7 @@ class boss_hunter_toc5 : public CreatureScript`
`850`	`850`	`Player* player = itr->getSource();`
`851`	`851`	`if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false))`
`852`	`852`	`{`
`853`		`- DoCast(target, SPELL_MULTI_SHOT);`
	`853`	`+ DoCast(player, SPELL_MULTI_SHOT);`
`854`	`854`	`break;`
`855`	`855`	`}`
`856`	`856`	`}`