mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[7800] Small fixes for scripting case ActivateTaxiPathTo use:
* Allow wide mount model lookup in DBC data for script case * Allow 0-coordinates node use in script case
This commit is contained in:
parent
943c76869d
commit
b9cd3ffd0d
2 changed files with 6 additions and 4 deletions
|
|
@ -16797,8 +16797,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// node must have pos if not spell case (npc!=0)
|
// node must have pos if taxi master case (npc != NULL)
|
||||||
else if(!spellid)
|
else if (npc)
|
||||||
{
|
{
|
||||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||||
data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
|
data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
|
||||||
|
|
@ -16850,8 +16850,10 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
|
||||||
prevnode = lastnode;
|
prevnode = lastnode;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), spellid != 0);
|
// get mount model (in case non taximaster (npc==NULL) allow more wide lookup)
|
||||||
|
uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), npc == NULL);
|
||||||
|
|
||||||
|
// in spell case allow 0 model
|
||||||
if (mount_id == 0 && spellid == 0 || sourcepath == 0)
|
if (mount_id == 0 && spellid == 0 || sourcepath == 0)
|
||||||
{
|
{
|
||||||
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7799"
|
#define REVISION_NR "7800"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue