diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-24 19:32:13 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-24 19:36:32 +0100 |
| commit | a5ade26fa0b1771d7adaf8c3ca8631421e8f670b (patch) | |
| tree | 7f8b4e3add4b7f323ae8aa869ccd2c5ca3af069e /src/server/game/Handlers/LootHandler.cpp | |
| parent | b61bf8f01f6ec9298df6b94eb31cadbde72c4b57 (diff) | |
| parent | 9531073b7787ae65140b436395411194b43fd4ed (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Spells/spell_rogue.cpp
Diffstat (limited to 'src/server/game/Handlers/LootHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/LootHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index 6e57fe590d9..72d3fd5a746 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -232,7 +232,7 @@ void WorldSession::HandleLootOpcode(WorldPacket& recvData) recvData >> guid; // Check possible cheat - if (!_player->IsAlive()) + if (!GetPlayer()->IsAlive() || !IS_CRE_OR_VEH_GUID(guid)) return; GetPlayer()->SendLoot(guid, LOOT_CORPSE); |