From 4da3cbf3aaeed2fe18bb66cc002bcb6feb6c9647 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:49:59 +0200 Subject: [PATCH] improved fix --- sql/base/characters_database.sql | 2 +- sql/updates/characters/3.3.5/9999_99_99_99_characters.sql | 2 +- src/server/game/Spells/Auras/SpellAuras.cpp | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 253489b295b..5741df598f1 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2955,7 +2955,7 @@ INSERT INTO `updates` VALUES ('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0), ('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0), ('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0), -('9999_99_99_99_characters.sql','EAE07A3E42B5E732FFEBEC88717A5BFA696B33FB','ARCHIVED','2018-03-23 12:46:28',0); +('9999_99_99_99_characters.sql','A1543319D97AC030143A61D4CE40CB9A017B8232','ARCHIVED','2018-03-23 12:46:28',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql index 38b508fc635..d2d8f7e201a 100644 --- a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql +++ b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql @@ -1,2 +1,2 @@ -- -DELETE FROM `pet_aura` WHERE `spell`=57634; +DELETE FROM `pet_aura` WHERE `spell` IN (28801, 37025, 42201, 57634); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 28b415379b1..4c9d2ee3147 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1025,7 +1025,6 @@ bool Aura::CanBeSaved() const case 44413: // Incanter's Absorption case 40075: // Fel Flak Fire case 55849: // Power Spark - case 57634: // Magma return false; } @@ -1041,6 +1040,11 @@ bool Aura::CanBeSaved() const if (GetCastItemGUID() && IsPermanent()) return false; + // don't save liquid auras + for (LiquidTypeEntry const* liquid : sLiquidTypeStore) + if (liquid->SpellId && liquid->SpellId == GetId()) + return false; + return true; }