Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed shapeshift location check

Browse Source
This commit is contained in:
Shauren
2017-12-11 20:40:32 +01:00
parent 2362abbce0
commit 9b6be90b2b
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Player/Player.cpp
View File

@@ -25665,13 +25665,6 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot, AELootResult* aeResult/*
SendEquipError(msg, nullptr, nullptr, item->itemid);
}
bool Player::CanFlyInZone(uint32 mapid, uint32 zone) const
{
// continent checked in SpellInfo::CheckLocation at cast and area update
uint32 v_map = sDB2Manager.GetVirtualMapForMapAndZone(mapid, zone);
return v_map != 571 || HasSpell(54197); // 54197 = Cold Weather Flying
}
void Player::LearnSpellHighestRank(uint32 spellid)
{
LearnSpell(spellid, false);

2
src/server/game/Entities/Player/Player.h
View File

@@ -2120,8 +2120,6 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
void SetFallInformation(uint32 time, float z);
void HandleFall(MovementInfo const& movementInfo);
bool CanFlyInZone(uint32 mapid, uint32 zone) const;
void SetClientControl(Unit* target, bool allowMove);
void SetMover(Unit* target);

13
src/server/game/Spells/SpellInfo.cpp
View File

@@ -1835,15 +1835,12 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a
switch (effect->ApplyAuraName)
{
case SPELL_AURA_FLY:
case SPELL_AURA_MOD_SHAPESHIFT:
{
SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(Id);
for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter)
{
if (skillIter->second->SkillLine == SKILL_MOUNTS)
if (!player->CanFlyInZone(map_id, zone_id))
return SPELL_FAILED_INCORRECT_AREA;
}
if (SpellShapeshiftFormEntry const* spellShapeshiftForm = sSpellShapeshiftFormStore.LookupEntry(effect->MiscValue))
if (uint32 mountType = spellShapeshiftForm->MountTypeID)
if (!player->GetMountCapability(mountType))
return SPELL_FAILED_NOT_HERE;
break;
}
case SPELL_AURA_MOUNTED: