From d5beb2bbe97afa0e50df8a2cef49bcac4a607f4a Mon Sep 17 00:00:00 2001 From: KingPin Date: Sun, 2 Nov 2008 16:53:46 -0600 Subject: [svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT * Default behaviour of pets for creatures changed to REACT_DEFENSIVE * Disallowed sending wrapped items as COD * Prevent loading and saving single target auras for pet in same way as already implemented for player * Correctly limit use some flask types to zones. * Fixed extracting common.MPQ under *nix * Many small xleanups and fixes. ** mangos merge rev. TEST REV so be careful of creepy crawly bugs! --HG-- branch : trunk --- src/game/SpellMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game/SpellMgr.cpp') diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index dec7225e4b5..a7f73ac7e45 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2192,7 +2192,7 @@ bool IsSpellAllowedInLocation(SpellEntry const *spellInfo,uint32 map_id,uint32 z // in the Blade's Edge Mountains Plateaus and Gruul's Lair. return zone_id ==3522 || map_id==565; } - if(mask & ELIXIR_UNSTABLE_MASK) + if(mask & ELIXIR_SHATTRATH_MASK) { // in Tempest Keep, Serpentshrine Cavern, Caverns of Time: Mount Hyjal, Black Temple // TODO: and the Sunwell Plateau -- cgit v1.2.3