diff options
| -rw-r--r-- | sql/base/characters_database.sql | 2 | ||||
| -rw-r--r-- | sql/updates/characters/3.3.5/9999_99_99_99_characters.sql | 2 | ||||
| -rw-r--r-- | 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 68c20d4ffff..054deffec68 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2623,7 +2623,7 @@ INSERT INTO `updates` VALUES ('2017_11_27_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-27 22:08:42',0), ('2018_01_13_00_characters.sql','E3C0DA9995BA71ED5A267294470CD03DC51862DD','ARCHIVED','2018-01-13 00:00:00',0), ('2018_02_19_00_characters.sql','FE5C5F9B88F0791549DDE680942493781E2269E6','RELEASED','2018-02-18 19:49:38',0), -('9999_99_99_99_characters.sql','EAE07A3E42B5E732FFEBEC88717A5BFA696B33FB','RELEASED','2018-03-23 12:46:28',0); +('9999_99_99_99_characters.sql','A1543319D97AC030143A61D4CE40CB9A017B8232','RELEASED','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 3002660d039..a9b69584732 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1149,7 +1149,6 @@ bool Aura::CanBeSaved() const case 44413: // Incanter's Absorption case 40075: // Fel Flak Fire case 55849: // Power Spark - case 57634: // Magma return false; } @@ -1161,6 +1160,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; } |