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
@@ -628,8 +628,6 @@ void KillRewarder::Reward()
|
||||
|
||||
// == Player ====================================================
|
||||
|
||||
UpdateMask Player::updateVisualBits;
|
||||
|
||||
// we can disable this warning for this since it only
|
||||
// causes undefined behavior when passed to the base class constructor
|
||||
#ifdef _MSC_VER
|
||||
@@ -953,6 +951,7 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo)
|
||||
}
|
||||
SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
|
||||
SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f); // fix cast time showed in spell tooltip on client
|
||||
SetFloatValue(UNIT_MOD_CAST_HASTE, 1.0f);
|
||||
SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f); // default for players in 3.0.3
|
||||
|
||||
// -1 is default value
|
||||
@@ -3203,6 +3202,7 @@ void Player::InitStatsForLevel(bool reapplyMods)
|
||||
|
||||
// set default cast time multiplier
|
||||
SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
|
||||
SetFloatValue(UNIT_MOD_CAST_HASTE, 1.0f);
|
||||
|
||||
// reset size before reapply auras
|
||||
SetObjectScale(1.0f);
|
||||
@@ -4506,117 +4506,6 @@ Mail* Player::GetMail(uint32 id)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void Player::_SetCreateBits(UpdateMask* updateMask, Player* target) const
|
||||
{
|
||||
if (target == this)
|
||||
Object::_SetCreateBits(updateMask, target);
|
||||
else
|
||||
{
|
||||
for (uint16 index = 0; index < m_valuesCount; index++)
|
||||
if (GetUInt32Value(index) != 0 && updateVisualBits.GetBit(index))
|
||||
updateMask->SetBit(index);
|
||||
}
|
||||
}
|
||||
|
||||
void Player::_SetUpdateBits(UpdateMask* updateMask, Player* target) const
|
||||
{
|
||||
if (target == this)
|
||||
Object::_SetUpdateBits(updateMask, target);
|
||||
else
|
||||
{
|
||||
Object::_SetUpdateBits(updateMask, target);
|
||||
*updateMask &= updateVisualBits;
|
||||
}
|
||||
}
|
||||
|
||||
void Player::InitVisibleBits()
|
||||
{
|
||||
updateVisualBits.SetCount(PLAYER_END);
|
||||
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_GUID);
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_GUID + 1);
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_DATA);
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_DATA + 1);
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_TYPE);
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_ENTRY);
|
||||
updateVisualBits.SetBit(OBJECT_FIELD_SCALE_X);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_CHARM + 0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_CHARM + 1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_SUMMON + 0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_SUMMON + 1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY + 0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY + 1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_TARGET + 0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_TARGET + 1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_CHANNEL_OBJECT + 0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_CHANNEL_OBJECT + 1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BYTES_0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_HEALTH);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_POWER1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_POWER2);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_POWER3);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_POWER4);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_POWER5);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MAXHEALTH);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER2);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER3);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER4);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER5);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_LEVEL);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_FACTIONTEMPLATE);
|
||||
updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_ID + 0);
|
||||
updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_ID + 1);
|
||||
updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_ID + 2);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_FLAGS);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_FLAGS_2);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_AURASTATE);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME + 0);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME + 1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BOUNDINGRADIUS);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_COMBATREACH);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_DISPLAYID);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_NATIVEDISPLAYID);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_MOUNTDISPLAYID);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BYTES_1);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_PETNUMBER);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_PET_NAME_TIMESTAMP);
|
||||
updateVisualBits.SetBit(UNIT_DYNAMIC_FLAGS);
|
||||
updateVisualBits.SetBit(UNIT_CHANNEL_SPELL);
|
||||
updateVisualBits.SetBit(UNIT_MOD_CAST_SPEED);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BASE_MANA);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_BYTES_2);
|
||||
updateVisualBits.SetBit(UNIT_FIELD_HOVERHEIGHT);
|
||||
|
||||
updateVisualBits.SetBit(PLAYER_DUEL_ARBITER + 0);
|
||||
updateVisualBits.SetBit(PLAYER_DUEL_ARBITER + 1);
|
||||
updateVisualBits.SetBit(PLAYER_FLAGS);
|
||||
updateVisualBits.SetBit(PLAYER_GUILDRANK);
|
||||
updateVisualBits.SetBit(PLAYER_BYTES);
|
||||
updateVisualBits.SetBit(PLAYER_BYTES_2);
|
||||
updateVisualBits.SetBit(PLAYER_BYTES_3);
|
||||
updateVisualBits.SetBit(PLAYER_DUEL_TEAM);
|
||||
updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP);
|
||||
updateVisualBits.SetBit(UNIT_NPC_FLAGS);
|
||||
|
||||
// PLAYER_QUEST_LOG_x also visible bit on official (but only on party/raid)...
|
||||
for (uint16 i = PLAYER_QUEST_LOG_1_1; i < PLAYER_QUEST_LOG_25_2; i += MAX_QUEST_OFFSET)
|
||||
updateVisualBits.SetBit(i);
|
||||
|
||||
// Players visible items are not inventory stuff
|
||||
for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
|
||||
{
|
||||
uint16 offset = i * 2;
|
||||
|
||||
// item entry
|
||||
updateVisualBits.SetBit(PLAYER_VISIBLE_ITEM_1_ENTRYID + offset);
|
||||
// enchant
|
||||
updateVisualBits.SetBit(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + offset);
|
||||
}
|
||||
|
||||
updateVisualBits.SetBit(PLAYER_CHOSEN_TITLE);
|
||||
}
|
||||
|
||||
void Player::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const
|
||||
{
|
||||
for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
|
||||
@@ -17218,7 +17107,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
|
||||
SetUInt32Value(UNIT_CHANNEL_SPELL, 0);
|
||||
|
||||
// clear charm/summon related fields
|
||||
SetUInt64Value(UNIT_FIELD_SUMMONEDBY, 0);
|
||||
SetOwnerGUID(0);
|
||||
SetUInt64Value(UNIT_FIELD_CHARMEDBY, 0);
|
||||
SetUInt64Value(UNIT_FIELD_CHARM, 0);
|
||||
SetUInt64Value(UNIT_FIELD_SUMMON, 0);
|
||||
|
||||
Reference in new issue
Block a user