From 0583b4bd047dba91d8fcdd221a1411658d733d3e Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Mon, 13 Apr 2009 21:59:44 +0200
Subject: *Prevent item trade exploit - by Iskander. *Do not set cooldown for
 triggered spells. *Do not allow to kill unit twice.

--HG--
branch : trunk
---
 src/game/Player.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/game/Player.cpp')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 2d7d98579a8..b9f8edf2b66 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -9547,7 +9547,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
             for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; t++)
             {
                 pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t );
-                if( pBag )
+                if( pBag && ItemCanGoIntoBag(pItem->GetProto(), pBag->GetProto()))
                 {
                     for(uint32 j = 0; j < pBag->GetBagSize(); j++)
                     {
@@ -14418,7 +14418,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
 
     _LoadAuras(holder->GetResult(PLAYER_LOGIN_QUERY_LOADAURAS), time_diff);
     _LoadGlyphAuras();
-
     // add ghost flag (must be after aura load: PLAYER_FLAGS_GHOST set in aura)
     if( HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST) )
         m_deathState = DEAD;
-- 
cgit v1.2.3