Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
This commit is contained in:
commit
fc453ab623
41 files changed
+2852
-908
No files matched your search
@@ -56,6 +56,7 @@
|
||||
#include "MoveSplineInit.h"
|
||||
#include "MoveSpline.h"
|
||||
#include "ConditionMgr.h"
|
||||
#include "UpdateFieldFlags.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
@@ -9663,6 +9664,31 @@ bool Unit::HasAuraState(AuraStateType flag, SpellInfo const* spellProto, Unit co
|
||||
return HasFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1));
|
||||
}
|
||||
|
||||
void Unit::SetOwnerGUID(uint64 owner)
|
||||
{
|
||||
if (GetOwnerGUID() == owner)
|
||||
return;
|
||||
|
||||
SetUInt64Value(UNIT_FIELD_SUMMONEDBY, owner);
|
||||
if (!owner)
|
||||
return;
|
||||
|
||||
// Update owner dependent fields
|
||||
Player* player = ObjectAccessor::GetPlayer(*this, owner);
|
||||
if (!player || !player->HaveAtClient(this)) // if player cannot see this unit yet, he will receive needed data with create object
|
||||
return;
|
||||
|
||||
SetFieldNotifyFlag(UF_FLAG_OWNER);
|
||||
|
||||
UpdateData udata(GetMapId());
|
||||
WorldPacket packet;
|
||||
BuildValuesUpdateBlockForPlayer(&udata, player);
|
||||
udata.BuildPacket(&packet);
|
||||
player->SendDirectMessage(&packet);
|
||||
|
||||
RemoveFieldNotifyFlag(UF_FLAG_OWNER);
|
||||
}
|
||||
|
||||
Unit* Unit::GetOwner() const
|
||||
{
|
||||
if (uint64 ownerid = GetOwnerGUID())
|
||||
@@ -9748,12 +9774,14 @@ void Unit::SetMinion(Minion *minion, bool apply)
|
||||
|
||||
if (apply)
|
||||
{
|
||||
if (!minion->AddUInt64Value(UNIT_FIELD_SUMMONEDBY, GetGUID()))
|
||||
if (minion->GetOwnerGUID())
|
||||
{
|
||||
sLog->outCrash("SetMinion: Minion %u is not the minion of owner %u", minion->GetEntry(), GetEntry());
|
||||
return;
|
||||
}
|
||||
|
||||
minion->SetOwnerGUID(GetGUID());
|
||||
|
||||
m_Controlled.insert(minion);
|
||||
|
||||
if (GetTypeId() == TYPEID_PLAYER)
|
||||
@@ -12056,7 +12084,7 @@ MountCapabilityEntry const* Unit::GetMountCapability(uint32 mountType) const
|
||||
continue;
|
||||
}
|
||||
|
||||
if (mountCapability->RequiredMap != -1 && GetMapId() != mountCapability->RequiredMap)
|
||||
if (mountCapability->RequiredMap != -1 && int32(GetMapId()) != mountCapability->RequiredMap)
|
||||
continue;
|
||||
|
||||
if (mountCapability->RequiredArea && (mountCapability->RequiredArea != zoneId && mountCapability->RequiredArea != areaId))
|
||||
|
||||
Reference in new issue
Block a user