Merge branch 'master' into 320

This commit is contained in:
VladimirMangos 2009-10-02 19:09:06 +04:00
commit 59befa2e0e
42 changed files with 816 additions and 567 deletions

View file

@ -25,7 +25,6 @@
#include "Player.h"
#include "Item.h"
#include "UpdateData.h"
#include "ObjectAccessor.h"
void WorldSession::HandleSplitItemOpcode( WorldPacket & recv_data )
{
@ -1300,7 +1299,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
_player->ApplyEnchantment(itemTarget, EnchantmentSlot(enchant_slot), true);
bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();// current socketbonus state
if(SocketBonusActivated ^ SocketBonusToBeActivated) // if there was a change...
if(SocketBonusActivated != SocketBonusToBeActivated) // if there was a change...
{
_player->ApplyEnchantment(itemTarget,BONUS_ENCHANTMENT_SLOT, false);
itemTarget->SetEnchantment(BONUS_ENCHANTMENT_SLOT, (SocketBonusToBeActivated ? itemTarget->GetProto()->socketBonus : 0), 0, 0);