server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop21' of https://github.com/mangoszero/server into develop21

Browse Source
This commit is contained in:
Foereaper 2015-04-04 01:21:38 +02:00
commit 7550dfca0e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/Object/Object.cpp
View File

@ -261,6 +261,11 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint8 updateFlags) const
{
moveFlags |= MOVEFLAG_ONTRANSPORT;
}
float x, y, z;
if (m_objectTypeId == TYPEID_UNIT && ((Unit*)this)->GetMotionMaster()->GetDestination(x, y, z))
{
moveFlags |= MOVEFLAG_WALK_MODE | MOVEFLAG_FORWARD | MOVEFLAG_SPLINE_ENABLED;
}
*data << uint32(moveFlags); // movement flags
*data << uint32(WorldTimer::getMSTime()); // time (in milliseconds)

3
src/game/Object/ObjectMgr.cpp
View File

@ -6876,6 +6876,8 @@ bool ObjectMgr::IsPlayerMeetToCondition(uint16 conditionId, Player const* pPlaye
return false;
}
// Attention: make sure to keep this list in sync with ConditionSource to avoid array
// out of bounds access! It is accessed with ConditionSource as index!
char const* conditionSourceToStr[] =
{
"loot system",
@ -6886,6 +6888,7 @@ char const* conditionSourceToStr[] =
"hardcoded",
"vendor's item check",
"spell_area check",
"npc_spellclick_spells check", // Unused. For 3.x and later.
"DBScript engine"
};

1
src/game/WorldHandlers/Spell.cpp
View File

@ -4023,7 +4023,6 @@ SpellCastResult Spell::CheckCast(bool strict)
if ((*itr)->GetModifier()->m_miscvalue == 4327)
{
return SPELL_FAILED_FIZZLE;
itr = auraClassScripts.begin();
}
else
++itr;