Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
commit
cc28161670
17 files changed
+64
-68
No files matched your search
@@ -1579,8 +1579,7 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype)
|
||||
pItem->SetUInt32Value(ITEM_FIELD_CREATOR, player->GetGUIDLow());
|
||||
|
||||
// send info to the client
|
||||
if (pItem)
|
||||
player->SendNewItem(pItem, num_to_add, true, bgType == 0);
|
||||
player->SendNewItem(pItem, num_to_add, true, bgType == 0);
|
||||
|
||||
// we succeeded in creating at least one item, so a levelup is possible
|
||||
if (bgType == 0)
|
||||
@@ -1928,7 +1927,8 @@ void Spell::EffectOpenLock(SpellEffIndex effIndex)
|
||||
bg->EventPlayerClickedOnFlag(player, gameObjTarget);
|
||||
return;
|
||||
}
|
||||
}else if (m_spellInfo->Id == 1842 && gameObjTarget->GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && gameObjTarget->GetOwner())
|
||||
}
|
||||
else if (m_spellInfo->Id == 1842 && gameObjTarget->GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && gameObjTarget->GetOwner())
|
||||
{
|
||||
gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
|
||||
return;
|
||||
@@ -1965,7 +1965,7 @@ void Spell::EffectOpenLock(SpellEffIndex effIndex)
|
||||
|
||||
if (gameObjTarget)
|
||||
SendLoot(guid, LOOT_SKINNING);
|
||||
else
|
||||
else if (itemTarget)
|
||||
itemTarget->SetFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_UNLOCKED);
|
||||
|
||||
// not allow use skill grow at item base open
|
||||
|
||||
Reference in new issue
Block a user