[7798] More Player::ActivateTaxiPathTo use improvements Author: VladimirMangos
* Provide more explicit way about spell that cast taxi flight if any
* Remove incorrect states instead error reporting in case non-taximaster flight start (cast/script)
* Remove mount_id arg from ActivateTaxiPathTo and implement support for 0 mount_id case (spell 32474)
* Implement spell 32474 (except finilize part)
* Provided Player::ActivateTaxiPathTo(uint32 taxi_path_id) function version for simplify one node to node paths use by id.
--HG--
branch : trunk
This commit is contained in:
1 parent
7277ddd114
commit
29921b5bea
6 files changed
+84
-44
No files matched your search
+66
-27
@@ -17114,34 +17114,13 @@ void Player::HandleStealthedUnitsDetection()
|
||||
}
|
||||
}
|
||||
|
||||
bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, uint32 mount_id, Creature* npc)
|
||||
bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc /*= NULL*/, uint32 spellid /*= 0*/)
|
||||
{
|
||||
if(nodes.size() < 2)
|
||||
return false;
|
||||
|
||||
// not let cheating with start flight mounted
|
||||
if(IsMounted())
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIPLAYERALREADYMOUNTED);
|
||||
GetSession()->SendPacket(&data);
|
||||
return false;
|
||||
}
|
||||
|
||||
if( m_ShapeShiftFormSpellId && m_form != FORM_BATTLESTANCE && m_form != FORM_BERSERKERSTANCE && m_form != FORM_DEFENSIVESTANCE && m_form != FORM_SHADOW )
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIPLAYERSHAPESHIFTED);
|
||||
GetSession()->SendPacket(&data);
|
||||
return false;
|
||||
}
|
||||
|
||||
// not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
|
||||
if(GetSession()->isLogingOut() ||
|
||||
(!m_currentSpells[CURRENT_GENERIC_SPELL] ||
|
||||
m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Effect[0] != SPELL_EFFECT_SEND_TAXI)&&
|
||||
IsNonMeleeSpellCasted(false) ||
|
||||
isInCombat())
|
||||
if(GetSession()->isLogingOut() || isInCombat())
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIPLAYERBUSY);
|
||||
@@ -17152,6 +17131,52 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, uint32 mount_i
|
||||
if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
|
||||
return false;
|
||||
|
||||
// taximaster case
|
||||
if(npc)
|
||||
{
|
||||
// not let cheating with start flight mounted
|
||||
if(IsMounted())
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIPLAYERALREADYMOUNTED);
|
||||
GetSession()->SendPacket(&data);
|
||||
return false;
|
||||
}
|
||||
|
||||
if( m_ShapeShiftFormSpellId && m_form != FORM_BATTLESTANCE && m_form != FORM_BERSERKERSTANCE && m_form != FORM_DEFENSIVESTANCE && m_form != FORM_SHADOW )
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIPLAYERSHAPESHIFTED);
|
||||
GetSession()->SendPacket(&data);
|
||||
return false;
|
||||
}
|
||||
|
||||
// not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
|
||||
if(IsNonMeleeSpellCasted(false))
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIPLAYERBUSY);
|
||||
GetSession()->SendPacket(&data);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// cast case or scripted call case
|
||||
else
|
||||
{
|
||||
RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
|
||||
|
||||
if( m_ShapeShiftFormSpellId && m_form != FORM_BATTLESTANCE && m_form != FORM_BERSERKERSTANCE && m_form != FORM_DEFENSIVESTANCE && m_form != FORM_SHADOW )
|
||||
RemoveAurasDueToSpell(m_ShapeShiftFormSpellId);
|
||||
|
||||
if(m_currentSpells[CURRENT_GENERIC_SPELL] && m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id != spellid)
|
||||
InterruptSpell(CURRENT_GENERIC_SPELL,false);
|
||||
|
||||
InterruptSpell(CURRENT_AUTOREPEAT_SPELL,false);
|
||||
|
||||
if(m_currentSpells[CURRENT_CHANNELED_SPELL] && m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->Id != spellid)
|
||||
InterruptSpell(CURRENT_CHANNELED_SPELL,true);
|
||||
}
|
||||
|
||||
uint32 sourcenode = nodes[0];
|
||||
|
||||
// starting node too far away (cheat?)
|
||||
@@ -17180,7 +17205,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, uint32 mount_i
|
||||
}
|
||||
}
|
||||
// node must have pos if not spell case (npc!=0)
|
||||
else if(npc)
|
||||
else if(!spellid)
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
|
||||
@@ -17232,10 +17257,9 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, uint32 mount_i
|
||||
prevnode = lastnode;
|
||||
}
|
||||
|
||||
if(!mount_id) // if not provide then attempt use default, allow seelct alt team mount creature model but for proper team in spell case.
|
||||
mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), npc == NULL);
|
||||
uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), spellid != 0);
|
||||
|
||||
if (mount_id == 0 || sourcepath == 0)
|
||||
if (mount_id == 0 && spellid == 0 || sourcepath == 0)
|
||||
{
|
||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||
data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
|
||||
@@ -17277,6 +17301,21 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, uint32 mount_i
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Player::ActivateTaxiPathTo( uint32 taxi_path_id, uint32 spellid /*= 0*/ )
|
||||
{
|
||||
TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(taxi_path_id);
|
||||
if(!entry)
|
||||
return false;
|
||||
|
||||
std::vector<uint32> nodes;
|
||||
|
||||
nodes.resize(2);
|
||||
nodes[0] = entry->from;
|
||||
nodes[1] = entry->to;
|
||||
|
||||
return ActivateTaxiPathTo(nodes,NULL,spellid);
|
||||
}
|
||||
|
||||
void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
|
||||
{
|
||||
// last check 2.0.10
|
||||
|
||||
Reference in new issue
Block a user