josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Items: Attempt to fix crash in Player::SplitItem caused by 6a44399852.

Browse Source 
And some random cleanup
This commit is contained in:
kaelima
2012-01-18 06:07:30 +01:00
parent b754f7c91d
commit 819da8af4d
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+6 -2
View File
@@ -12842,7 +12842,7 @@ void Player::SplitItem(uint16 src, uint16 dst, uint32 count)
pSrcItem->SetState(ITEM_CHANGED, this); pSrcItem->SetState(ITEM_CHANGED, this);
StoreItem(dest, pNewItem, true); StoreItem(dest, pNewItem, true);
} }
else if (IsBankPos (dst)) else if (IsBankPos(dst))
{ {
// change item amount before check (for unique max count check) // change item amount before check (for unique max count check)
pSrcItem->SetCount(pSrcItem->GetCount() - count); pSrcItem->SetCount(pSrcItem->GetCount() - count);
@@ -12862,7 +12862,7 @@ void Player::SplitItem(uint16 src, uint16 dst, uint32 count)
pSrcItem->SetState(ITEM_CHANGED, this); pSrcItem->SetState(ITEM_CHANGED, this);
BankItem(dest, pNewItem, true); BankItem(dest, pNewItem, true);
} }
else if (IsEquipmentPos (dst)) else if (IsEquipmentPos(dst))
{ {
// change item amount before check (for unique max count check), provide space for splitted items // change item amount before check (for unique max count check), provide space for splitted items
pSrcItem->SetCount(pSrcItem->GetCount() - count); pSrcItem->SetCount(pSrcItem->GetCount() - count);
@@ -12884,6 +12884,10 @@ void Player::SplitItem(uint16 src, uint16 dst, uint32 count)
AutoUnequipOffhandIfNeed(); AutoUnequipOffhandIfNeed();
} }
//! Make sure that code below only is executed when trading
if (!GetTradeData())
return;
//! Update item count in trade window, prevent spoofing //! Update item count in trade window, prevent spoofing
//! Since pSrcItem has its count updated (see above), Item::GetCount() will return the new count //! Since pSrcItem has its count updated (see above), Item::GetCount() will return the new count
//! in the underlying packet builder function //! in the underlying packet builder function
src/server/game/Entities/Unit/Unit.cpp
+2 -2
View File
@@ -2114,12 +2114,12 @@ void Unit::SendMeleeAttackStart(Unit* victim)
void Unit::SendMeleeAttackStop(Unit* victim) void Unit::SendMeleeAttackStop(Unit* victim)
{ {
WorldPacket data(SMSG_ATTACKSTOP, (8+8+4)); // we guess size WorldPacket data(SMSG_ATTACKSTOP, (8+8+4));
data.append(GetPackGUID()); data.append(GetPackGUID());
data.append(victim ? victim->GetPackGUID() : 0); // can be 0x00... data.append(victim ? victim->GetPackGUID() : 0); // can be 0x00...
data << uint32(0); // can be 0x1 data << uint32(0); // can be 0x1
SendMessageToSet(&data, true); SendMessageToSet(&data, true);
sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTART"); sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTOP");
if (victim) if (victim)
sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUIDLow()); sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUIDLow());