ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): Null check the helpers (#11476)

Browse source 
* fix (core): move helper

* Update Spell.cpp

* Update Unit.cpp
This commit is contained in:
acidmanifesto 2022-04-22 09:11:06 -04:00 • committed by GitHub
parent f137230974
commit f2de895921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/server/game/Entities/Unit/Unit.cpp
View file

@ -19154,7 +19154,10 @@ void Unit::ExitVehicle(Position const* /*exitPosition*/)
return;
GetVehicleBase()->RemoveAurasByType(SPELL_AURA_CONTROL_VEHICLE, GetGUID());
ToPlayer()->SetCanTeleport(true);
if (Player* player = ToPlayer())
{
player->SetCanTeleport(true);
}
//! The following call would not even be executed successfully as the
//! SPELL_AURA_CONTROL_VEHICLE unapply handler already calls _ExitVehicle without
//! specifying an exitposition. The subsequent call below would return on if (!m_vehicle).

3
src/server/game/Spells/Spell.cpp
View file

@ -6036,7 +6036,8 @@ SpellCastResult Spell::CheckCast(bool strict)
if (m_pathFinder->GetPathType() & (PATHFIND_NOPATH | PATHFIND_INCOMPLETE) || target->GetExactDistSq(endPos.x, endPos.y, endPos.z) > maxdist * maxdist || m_pathFinder->getPathLength() > (40.0f + (m_caster->HasAura(58097) ? 5.0f : 0.0f)))
return SPELL_FAILED_NOPATH;
}
m_caster->ToPlayer()->SetCanTeleport(true);
if (Player* player = m_caster->ToPlayer())
player->SetCanTeleport(true);
break;
}
case SPELL_EFFECT_SKINNING: