Merge 3.3.5 to 3.3.5-1vs1

TrinityCore · Jul 17, 2023 · f11fcda · f11fcda
2 parents 3a29ef9 + 04aab7b
commit f11fcda
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
@@ -352,13 +352,13 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
     HandleClientCastFlags(recvPacket, castFlags, targets);
 
     // not have spell in spellbook
-    if (_player->GetTypeId() == TYPEID_PLAYER && !_player->ToPlayer()->HasActiveSpell(spellId))
+    if (!_player->HasActiveSpell(spellId))
     {
         bool allow = false;
 
         // allow casting of unknown spells for special lock cases
-        if (GameObject *go = targets.GetGOTarget())
-            if (go->GetSpellForLock(_player->ToPlayer()) == spellInfo)
+        if (GameObject* go = targets.GetGOTarget())
+            if (go->GetSpellForLock(_player) == spellInfo)
                 allow = true;
 
         // allow casting of spells triggered by clientside periodic trigger auras