diff options
| author | Spp <spp@jorge.gr> | 2013-03-25 14:34:22 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-03-25 14:34:22 +0100 |
| commit | c97c381ea0b63963b3756f531b8c64636cb5d66b (patch) | |
| tree | c5a99580d20b16b3eb957faab142b7761fefd507 /src/server/scripts/Spells | |
| parent | 132cc295ca7f1eeb29aaa1ff821faa47ef3478f9 (diff) | |
| parent | 1a6a23ec96c7646d2753198f93eaba62d2732a83 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Events/GameEventMgr.cpp
src/server/game/Loot/LootMgr.cpp
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index c9c75cdb134..0c9817ba167 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -813,6 +813,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader enum ShadowsFate { SPELL_SOUL_FEAST = 71203, + NPC_SINDRAGOSA = 36853 }; class spell_item_unsated_craving : public SpellScriptLoader @@ -831,7 +832,7 @@ class spell_item_unsated_craving : public SpellScriptLoader return false; Unit* target = procInfo.GetActionTarget(); - if (!target || target->GetTypeId() != TYPEID_UNIT || target->GetCreatureType() == CREATURE_TYPE_CRITTER || target->isSummon()) + if (!target || target->GetTypeId() != TYPEID_UNIT || target->GetCreatureType() == CREATURE_TYPE_CRITTER || (target->GetEntry() != NPC_SINDRAGOSA && target->isSummon())) return false; return true; |