diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 2b81574fc..97e2b94eb 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1484,7 +1484,6 @@ void GameObject::Use(Unit* user) Unit* spellCaster = user; uint32 spellId = 0; bool triggered = false; - bool tmpfish = false; if (Player* playerUser = user->ToPlayer()) { @@ -1707,7 +1706,6 @@ void GameObject::Use(Unit* user) // cast this spell later if provided spellId = info->goober.spellId; spellCaster = user; - tmpfish = true; break; } @@ -1796,8 +1794,6 @@ void GameObject::Use(Unit* user) } else // else: junk player->SendLoot(GetGUID(), LOOT_FISHING_JUNK); - - tmpfish = true; break; } case GO_JUST_DEACTIVATED: // nothing to do, will be deleted at next update @@ -1811,11 +1807,7 @@ void GameObject::Use(Unit* user) break; } } - - if(tmpfish) - player->FinishSpell(CURRENT_CHANNELED_SPELL, true); - else - player->InterruptSpell(CURRENT_CHANNELED_SPELL, true, true, true); + player->FinishSpell(CURRENT_CHANNELED_SPELL, true); return; }