diff options
| author | Shocker <shocker@freakz.ro> | 2011-11-27 00:40:58 +0200 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-11-27 00:40:58 +0200 |
| commit | dd06dc75e6afde438b7f2fee3725f06e090dc640 (patch) | |
| tree | 29d5b47287b4c7a14efe2572c2a239952c460a73 | |
| parent | 0136c8605427a058f464d1d8d41be0d969ce0c30 (diff) | |
Revert "Core/Pets: Water Elementals are now permanent pets" (wrong branch)
This reverts commit 0136c8605427a058f464d1d8d41be0d969ce0c30.
Also add line ending to recently added SQL file
| -rw-r--r-- | sql/updates/world/2011_11_27_00_world_spell_script.sql | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/updates/world/2011_11_27_00_world_spell_script.sql b/sql/updates/world/2011_11_27_00_world_spell_script.sql index 2919c3e6538..5411d660c2b 100644 --- a/sql/updates/world/2011_11_27_00_world_spell_script.sql +++ b/sql/updates/world/2011_11_27_00_world_spell_script.sql @@ -3,4 +3,4 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (20911,'spell_gen_damage_reduction_aura'), -- Blessing of Sanctuary (25899,'spell_gen_damage_reduction_aura'), -- Greater Blessing of Sanctuary (63944,'spell_gen_damage_reduction_aura'), -- Renewed Hope -(50720,'spell_gen_damage_reduction_aura'); -- Vigilance
\ No newline at end of file +(50720,'spell_gen_damage_reduction_aura'); -- Vigilance diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index e20a4860896..404fe24d467 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1764,8 +1764,6 @@ bool Pet::IsPermanentPetFor(Player* owner) return GetCreatureInfo()->type == CREATURE_TYPE_DEMON; case CLASS_DEATH_KNIGHT: return GetCreatureInfo()->type == CREATURE_TYPE_UNDEAD; - case CLASS_MAGE: - return GetCreatureInfo()->type == CREATURE_TYPE_ELEMENTAL; default: return false; } |