Fixed some typos and revert one commit
--HG-- branch : trunk
This commit is contained in:
1 parent
50bf68e099
commit
5a3b3d83ee
9 files changed
+69
-36
No files matched your search
+19
-19
@@ -10954,7 +10954,7 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
|
||||
if (IsInWorld() && update)
|
||||
{
|
||||
pItem->AddToWorld();
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
}
|
||||
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
@@ -10965,7 +10965,7 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
|
||||
if( IsInWorld() && update )
|
||||
{
|
||||
pItem->AddToWorld();
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
}
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
pBag->SetState(ITEM_CHANGED, this);
|
||||
@@ -10985,7 +10985,7 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
|
||||
|
||||
pItem2->SetCount( pItem2->GetCount() + count );
|
||||
if (IsInWorld() && update)
|
||||
pItem2->SendCreateUpdateToPlayer( this );
|
||||
pItem2->SendUpdateToPlayer( this );
|
||||
|
||||
if (!clone)
|
||||
{
|
||||
@@ -11075,7 +11075,7 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
|
||||
if( IsInWorld() && update )
|
||||
{
|
||||
pItem->AddToWorld();
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
}
|
||||
|
||||
ApplyEquipCooldown(pItem);
|
||||
@@ -11102,7 +11102,7 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
|
||||
{
|
||||
pItem2->SetCount( pItem2->GetCount() + pItem->GetCount() );
|
||||
if( IsInWorld() && update )
|
||||
pItem2->SendCreateUpdateToPlayer( this );
|
||||
pItem2->SendUpdateToPlayer( this );
|
||||
|
||||
// delete item (it not in any slot currently)
|
||||
//pItem->DeleteFromDB();
|
||||
@@ -11143,7 +11143,7 @@ void Player::QuickEquipItem( uint16 pos, Item *pItem)
|
||||
if( IsInWorld() )
|
||||
{
|
||||
pItem->AddToWorld();
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
}
|
||||
|
||||
GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
|
||||
@@ -11270,7 +11270,7 @@ void Player::RemoveItem(uint8 bag, uint8 slot, bool update)
|
||||
// pItem->SetUInt64Value(ITEM_FIELD_OWNER, 0); not clear owner at remove (it will be set at store). This used in mail and auction code
|
||||
pItem->SetSlot(NULL_SLOT);
|
||||
if(IsInWorld() && update)
|
||||
pItem->SendCreateUpdateToPlayer(this);
|
||||
pItem->SendUpdateToPlayer(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11422,7 +11422,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
|
||||
ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
|
||||
pItem->SetCount(pItem->GetCount() - count + remcount);
|
||||
if (IsInWorld() & update)
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
return;
|
||||
}
|
||||
@@ -11450,7 +11450,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
|
||||
ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
|
||||
pItem->SetCount( pItem->GetCount() - count + remcount );
|
||||
if (IsInWorld() & update)
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
return;
|
||||
}
|
||||
@@ -11483,7 +11483,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
|
||||
ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
|
||||
pItem->SetCount( pItem->GetCount() - count + remcount );
|
||||
if (IsInWorld() && update)
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
return;
|
||||
}
|
||||
@@ -11516,7 +11516,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
|
||||
ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
|
||||
pItem->SetCount( pItem->GetCount() - count + remcount );
|
||||
if (IsInWorld() & update)
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
return;
|
||||
}
|
||||
@@ -11601,7 +11601,7 @@ void Player::DestroyItemCount( Item* pItem, uint32 &count, bool update )
|
||||
pItem->SetCount( pItem->GetCount() - count );
|
||||
count = 0;
|
||||
if( IsInWorld() & update )
|
||||
pItem->SendCreateUpdateToPlayer( this );
|
||||
pItem->SendUpdateToPlayer( this );
|
||||
pItem->SetState(ITEM_CHANGED, this);
|
||||
}
|
||||
}
|
||||
@@ -11666,7 +11666,7 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
|
||||
}
|
||||
|
||||
if( IsInWorld() )
|
||||
pSrcItem->SendCreateUpdateToPlayer( this );
|
||||
pSrcItem->SendUpdateToPlayer( this );
|
||||
pSrcItem->SetState(ITEM_CHANGED, this);
|
||||
StoreItem( dest, pNewItem, true);
|
||||
}
|
||||
@@ -11686,7 +11686,7 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
|
||||
}
|
||||
|
||||
if( IsInWorld() )
|
||||
pSrcItem->SendCreateUpdateToPlayer( this );
|
||||
pSrcItem->SendUpdateToPlayer( this );
|
||||
pSrcItem->SetState(ITEM_CHANGED, this);
|
||||
BankItem( dest, pNewItem, true);
|
||||
}
|
||||
@@ -11706,7 +11706,7 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
|
||||
}
|
||||
|
||||
if( IsInWorld() )
|
||||
pSrcItem->SendCreateUpdateToPlayer( this );
|
||||
pSrcItem->SendUpdateToPlayer( this );
|
||||
pSrcItem->SetState(ITEM_CHANGED, this);
|
||||
EquipItem( dest, pNewItem, true);
|
||||
AutoUnequipOffhandIfNeed();
|
||||
@@ -11877,8 +11877,8 @@ void Player::SwapItem( uint16 src, uint16 dst )
|
||||
pDstItem->SetState(ITEM_CHANGED, this);
|
||||
if( IsInWorld() )
|
||||
{
|
||||
pSrcItem->SendCreateUpdateToPlayer( this );
|
||||
pDstItem->SendCreateUpdateToPlayer( this );
|
||||
pSrcItem->SendUpdateToPlayer( this );
|
||||
pDstItem->SendUpdateToPlayer( this );
|
||||
}
|
||||
}
|
||||
return;
|
||||
@@ -17901,7 +17901,7 @@ void Player::HandleStealthedUnitsDetection()
|
||||
{
|
||||
if(!hasAtClient)
|
||||
{
|
||||
(*i)->SendCreateUpdateToPlayer(this);
|
||||
(*i)->SendUpdateToPlayer(this);
|
||||
m_clientGUIDs.insert((*i)->GetGUID());
|
||||
|
||||
#ifdef MANGOS_DEBUG
|
||||
@@ -19324,7 +19324,7 @@ void Player::UpdateVisibilityOf(WorldObject* target)
|
||||
//if(target->isType(TYPEMASK_UNIT) && ((Unit*)target)->m_Vehicle)
|
||||
// UpdateVisibilityOf(((Unit*)target)->m_Vehicle);
|
||||
|
||||
target->SendCreateUpdateToPlayer(this);
|
||||
target->SendUpdateToPlayer(this);
|
||||
m_clientGUIDs.insert(target->GetGUID());
|
||||
|
||||
#ifdef TRINITY_DEBUG
|
||||
|
||||
Reference in new issue
Block a user