mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
[11448] Fixed typo as source for recent crashes at quest start.
Also more stricjed typecheck for Object::isType arg value.
This commit is contained in:
parent
8ee769a3cd
commit
a4e91c3593
4 changed files with 4 additions and 4 deletions
|
|
@ -65,7 +65,7 @@ void Camera::SetView(WorldObject *obj, bool update_far_sight_field /*= true*/)
|
|||
return;
|
||||
}
|
||||
|
||||
if (!obj->isType(TYPEMASK_DYNAMICOBJECT | TYPEMASK_UNIT))
|
||||
if (!obj->isType(TypeMask(TYPEMASK_DYNAMICOBJECT | TYPEMASK_UNIT)))
|
||||
{
|
||||
sLog.outError("Camera::SetView, viewpoint type is not available for client");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ class MANGOS_DLL_SPEC Object
|
|||
void SetObjectScale(float newScale);
|
||||
|
||||
uint8 GetTypeId() const { return m_objectTypeId; }
|
||||
bool isType(uint16 mask) const { return (mask & m_objectType); }
|
||||
bool isType(TypeMask mask) const { return (mask & m_objectType); }
|
||||
|
||||
virtual void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
|
||||
void SendCreateUpdateToPlayer(Player* player);
|
||||
|
|
|
|||
|
|
@ -13737,7 +13737,7 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
|
|||
}
|
||||
|
||||
// remove start item if not need
|
||||
if (questGiver && questGiver->isType(TYPEID_ITEM))
|
||||
if (questGiver && questGiver->isType(TYPEMASK_ITEM))
|
||||
{
|
||||
// destroy not required for quest finish quest starting item
|
||||
bool notRequiredItem = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "11447"
|
||||
#define REVISION_NR "11448"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue