From e7f1ab4a6a5cdba652979ad5f8d6f55910ce17d9 Mon Sep 17 00:00:00 2001 From: Shard <30301841+Shard-MW@users.noreply.github.com> Date: Mon, 9 Nov 2020 15:56:19 +0100 Subject: [PATCH 1/7] fix(Core/Logs): Fix arguments in function call (#3672) --- src/server/game/Spells/Auras/SpellAuras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index f71189093b..a9cc92965c 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -72,7 +72,7 @@ AuraApplication::AuraApplication(Unit* target, Unit* caster, Aura* aura, uint8 e else { #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outError(LOG_FILTER_SPELLS_AURAS, "Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask()); + sLog->outError("Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask()); #endif } } From 2204678c8fbb85a2cae1ff44d4e6c908e6c4f6e1 Mon Sep 17 00:00:00 2001 From: Patrick Lewis Date: Mon, 9 Nov 2020 08:04:56 -0800 Subject: [PATCH 2/7] fix(DB/creature_template) flags_extra for brewfest barker bunny's (#3505) --- data/sql/updates/pending_db_world/rev_1601091401144068714.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1601091401144068714.sql diff --git a/data/sql/updates/pending_db_world/rev_1601091401144068714.sql b/data/sql/updates/pending_db_world/rev_1601091401144068714.sql new file mode 100644 index 0000000000..a00b8e4e9a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1601091401144068714.sql @@ -0,0 +1,3 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1601091401144068714'); + +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00000080 WHERE `entry` IN (24202, 24203, 24204, 24205); From 01ee50d50e93a62cdbaf84ff4217c2c970d69e44 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Mon, 9 Nov 2020 16:06:03 +0000 Subject: [PATCH 3/7] chore(DB): import pending SQL update file Referenced commit(s): 2204678c8fbb85a2cae1ff44d4e6c908e6c4f6e1 --- data/sql/updates/db_world/2020_11_09_03.sql | 28 +++++++++++++++++++ .../rev_1601091401144068714.sql | 3 -- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 data/sql/updates/db_world/2020_11_09_03.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1601091401144068714.sql diff --git a/data/sql/updates/db_world/2020_11_09_03.sql b/data/sql/updates/db_world/2020_11_09_03.sql new file mode 100644 index 0000000000..64ec7c3b8e --- /dev/null +++ b/data/sql/updates/db_world/2020_11_09_03.sql @@ -0,0 +1,28 @@ +-- DB update 2020_11_09_02 -> 2020_11_09_03 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2020_11_09_02'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2020_11_09_02 2020_11_09_03 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1601091401144068714'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- + +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1601091401144068714'); + +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00000080 WHERE `entry` IN (24202, 24203, 24204, 24205); + +-- +-- END UPDATING QUERIES +-- +COMMIT; +END // +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1601091401144068714.sql b/data/sql/updates/pending_db_world/rev_1601091401144068714.sql deleted file mode 100644 index a00b8e4e9a..0000000000 --- a/data/sql/updates/pending_db_world/rev_1601091401144068714.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1601091401144068714'); - -UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00000080 WHERE `entry` IN (24202, 24203, 24204, 24205); From 1cccc8d4b5ca005adcadcc12142cb8fb5d658348 Mon Sep 17 00:00:00 2001 From: Knindza Date: Mon, 9 Nov 2020 21:37:40 +0100 Subject: [PATCH 4/7] fix(DB/smart_scripts): Improved Duskwood (#3614) --- .../rev_1603642724794965100.sql | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1603642724794965100.sql diff --git a/data/sql/updates/pending_db_world/rev_1603642724794965100.sql b/data/sql/updates/pending_db_world/rev_1603642724794965100.sql new file mode 100644 index 0000000000..b21f39b0cc --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1603642724794965100.sql @@ -0,0 +1,37 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1603642724794965100'); +/* + * Zone: Duskwood + * Update by Knindza | + * Copyright (C) & +*/ + +/* SMARTSCRIPT */ +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 898; +DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 898); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(898, 0, 0, 0, 4, 0, 100, 1, 0, 0, 0, 0, 11, 58867, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Nightbane Worgen - On Aggro - Cast \'58867\' (No Repeat)'); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 213; +DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 213); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(213, 0, 0, 0, 2, 0, 100, 1, 1, 5, 0, 0, 11, 3149, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Starving Dire Wolf - Between 1-5% Health - Cast \'3149\' (No Repeat)'); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 3; +DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3, 0, 0, 0, 2, 0, 100, 0, 1, 5, 0, 0, 11, 13496, 32, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Flash Eater - Between 1-5% Health - Cast \'13496\''); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 1871; +DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 1871); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1871, 0, 0, 0, 0, 0, 100, 0, 5700, 6900, 14500, 17800, 11, 3391, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Eliza\'s Guard - In Combat - Cast \'3391\''); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 521; +DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 521); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(521, 0, 0, 0, 2, 0, 100, 1, 20, 80, 0, 0, 11, 3149, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lupos - Between 20-80% Health - Cast \'3149\' (No Repeat)'); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 923; +DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 923); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(923, 0, 0, 0, 2, 0, 100, 1, 1, 5, 0, 0, 11, 3149, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Young Black Ravager - Between 1-5% Health - Cast \'3149\' (No Repeat)'); From df33ea78f482754c40118e02f4f39b399cfcd9b3 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Mon, 9 Nov 2020 20:38:42 +0000 Subject: [PATCH 5/7] chore(DB): import pending SQL update file Referenced commit(s): 1cccc8d4b5ca005adcadcc12142cb8fb5d658348 --- .../2020_11_09_04.sql} | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) rename data/sql/updates/{pending_db_world/rev_1603642724794965100.sql => db_world/2020_11_09_04.sql} (86%) diff --git a/data/sql/updates/pending_db_world/rev_1603642724794965100.sql b/data/sql/updates/db_world/2020_11_09_04.sql similarity index 86% rename from data/sql/updates/pending_db_world/rev_1603642724794965100.sql rename to data/sql/updates/db_world/2020_11_09_04.sql index b21f39b0cc..98d41a2c35 100644 --- a/data/sql/updates/pending_db_world/rev_1603642724794965100.sql +++ b/data/sql/updates/db_world/2020_11_09_04.sql @@ -1,3 +1,19 @@ +-- DB update 2020_11_09_03 -> 2020_11_09_04 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2020_11_09_03'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2020_11_09_03 2020_11_09_04 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1603642724794965100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- + INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1603642724794965100'); /* * Zone: Duskwood @@ -35,3 +51,12 @@ UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 923; DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 923); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES (923, 0, 0, 0, 2, 0, 100, 1, 1, 5, 0, 0, 11, 3149, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Young Black Ravager - Between 1-5% Health - Cast \'3149\' (No Repeat)'); + +-- +-- END UPDATING QUERIES +-- +COMMIT; +END // +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; From 1976e57ca8f76f253a7372b41ad18a4b7dbd37a6 Mon Sep 17 00:00:00 2001 From: WiZZy Date: Tue, 10 Nov 2020 05:07:26 +0200 Subject: [PATCH 6/7] fix(DB/gameobject): The Codex of Blood (#3546) --- data/sql/updates/pending_db_world/rev_1601868704763174600.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1601868704763174600.sql diff --git a/data/sql/updates/pending_db_world/rev_1601868704763174600.sql b/data/sql/updates/pending_db_world/rev_1601868704763174600.sql new file mode 100644 index 0000000000..f41156aa05 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1601868704763174600.sql @@ -0,0 +1,3 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1601868704763174600'); + +UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` = 182947; From 12362f64e7fcf5d9bd62b8ed7a024e9af8984476 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 10 Nov 2020 03:08:32 +0000 Subject: [PATCH 7/7] chore(DB): import pending SQL update file Referenced commit(s): 1976e57ca8f76f253a7372b41ad18a4b7dbd37a6 --- data/sql/updates/db_world/2020_11_10_00.sql | 28 +++++++++++++++++++ .../rev_1601868704763174600.sql | 3 -- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 data/sql/updates/db_world/2020_11_10_00.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1601868704763174600.sql diff --git a/data/sql/updates/db_world/2020_11_10_00.sql b/data/sql/updates/db_world/2020_11_10_00.sql new file mode 100644 index 0000000000..b2e75f6a27 --- /dev/null +++ b/data/sql/updates/db_world/2020_11_10_00.sql @@ -0,0 +1,28 @@ +-- DB update 2020_11_09_04 -> 2020_11_10_00 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2020_11_09_04'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2020_11_09_04 2020_11_10_00 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1601868704763174600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- + +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1601868704763174600'); + +UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` = 182947; + +-- +-- END UPDATING QUERIES +-- +COMMIT; +END // +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1601868704763174600.sql b/data/sql/updates/pending_db_world/rev_1601868704763174600.sql deleted file mode 100644 index f41156aa05..0000000000 --- a/data/sql/updates/pending_db_world/rev_1601868704763174600.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1601868704763174600'); - -UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` = 182947;