Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 08:59:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed caster unit validation for players that have charmed (not possessed) units

Browse Source
This commit is contained in:
Shauren
2022-01-16 18:45:07 +01:00
committed by Ovahlord
parent 9892d239a8
commit a06b3cea3c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Handlers/SpellHandler.cpp
View File

@@ -21,6 +21,7 @@
#include "Config.h"
#include "DatabaseEnv.h"
#include "DBCStores.h"
#include "GameClient.h"
#include "GameObject.h"
#include "GameObjectAI.h"
#include "Guild.h"
@@ -263,8 +264,8 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket)
void WorldSession::HandleCastSpellOpcode(WorldPackets::Spells::CastSpell& cast)
{
// ignore for remote control state (for player case)
Unit* mover = _player->GetCharmedOrSelf();
if (mover != _player && mover->IsPlayer())
Unit* mover = GetGameClient()->GetActivelyMovedUnit();
if (!mover || mover != _player && mover->IsPlayer())
return;
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(cast.Cast.SpellID);
@@ -401,9 +402,10 @@ void WorldSession::HandleCancelChanneling(WorldPacket& recvData)
if (spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL))
return;
Unit* mover = GetGameClient()->GetActivelyMovedUnit();
// ignore for remote control state (for player case)
Unit* mover = _player->GetCharmedOrSelf();
if (_player->GetCharmed() && _player->GetCharmed()->GetTypeId() == TYPEID_PLAYER)
if (!mover)
return;
mover->InterruptSpell(CURRENT_CHANNELED_SPELL);