diff --git a/.travis.yml b/.travis.yml
index a0ba819d935..6e473dabf8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,9 @@ addons:
- libbz2-dev
- libzmq3-dev
+services:
+ - mysql
+
before_install:
- git config user.email "travis@build.bot" && git config user.name "Travis CI"
- git tag -a -m "Travis build" init
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4758155e25c..626935f851e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7bd9263a70..150b9b71436 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,18 +7,18 @@ Contributing is not only about creating fixes, but also reporting bugs. Before r
Issues
======
-Read [this](http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
-If you have problems with TrinityCore installation, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/).
+Read [this](https://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
+If you have problems with TrinityCore installation, read [this](https://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/).
Mandatory things when creating a ticket:
========================================
- Branch
-- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](http://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.
+- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](https://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.
- entries of affected creatures / items / quests with a link to the relevant wowhead page.
- clear title and description of the bug - if your english is very bad, please use google translate or yandex to translate to english and include one text in your native language.
-When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)
+When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](https://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)
We sugest the title and body to have the next style:
@@ -39,8 +39,8 @@ Creating Pull Requests:
When creating patches read:
-- [TrinityCore Development Standards](http://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
-- [WDB Fields](http://www.trinitycore.org/f/topic/58-wdb-fields/)
+- [TrinityCore Development Standards](https://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
+- [WDB Fields](https://www.trinitycore.org/f/topic/58-wdb-fields/)
- [Git Squash](https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/)
@@ -53,7 +53,7 @@ Since it's very unlikely that your Pull Request will be merged on the day that y
Wiki
====
-The wiki is located at [http://trinitycore.info](http://trinitycore.info).
+The wiki is located at [https://trinitycore.info](https://trinitycore.info).
You are welcome to create an account and help us improve and extend the wiki.
@@ -62,7 +62,7 @@ Requirements
============
-Software requirements are available in the [wiki](http://www.trinitycore.info/display/tc/Requirements) for
+Software requirements are available in the [wiki](https://www.trinitycore.info/display/tc/Requirements) for
Windows, Linux and Mac OSX.
If you choose Linux, we recommend to use Debian 8, since it's the Linux that we use to test compilations.
diff --git a/PreLoad.cmake b/PreLoad.cmake
index 51f1e716f07..391bfea28bd 100644
--- a/PreLoad.cmake
+++ b/PreLoad.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake
index 3bc010f1731..9e89404c175 100644
--- a/cmake/genrev.cmake
+++ b/cmake/genrev.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/macros/AutoCollect.cmake b/cmake/macros/AutoCollect.cmake
index a55d2049503..d408c3cc9e1 100644
--- a/cmake/macros/AutoCollect.cmake
+++ b/cmake/macros/AutoCollect.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake
index af61e907376..5f363cc33fb 100644
--- a/cmake/macros/CheckBuildDir.cmake
+++ b/cmake/macros/CheckBuildDir.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/macros/ConfigureScripts.cmake b/cmake/macros/ConfigureScripts.cmake
index 1658f47e9e2..717adc533fb 100644
--- a/cmake/macros/ConfigureScripts.cmake
+++ b/cmake/macros/ConfigureScripts.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake
index 99ba073fdad..d1b06184fc9 100644
--- a/cmake/macros/FindGit.cmake
+++ b/cmake/macros/FindGit.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/macros/GroupSources.cmake b/cmake/macros/GroupSources.cmake
index a102760fc06..4f6f7741115 100644
--- a/cmake/macros/GroupSources.cmake
+++ b/cmake/macros/GroupSources.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/cmake/options.cmake b/cmake/options.cmake
index 6cd9aa2f539..0ef502e4102 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/contrib/conf_merge/tc-conf-merger.pl b/contrib/conf_merge/tc-conf-merger.pl
index 16f56bfcbd7..e6d08d28a5c 100644
--- a/contrib/conf_merge/tc-conf-merger.pl
+++ b/contrib/conf_merge/tc-conf-merger.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
# Author: leak
# Date: 2010-12-06
# Note: Based on conf file format of rev 10507
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 8b37fd406ee..9f671bba307 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/SFMT/CMakeLists.txt b/dep/SFMT/CMakeLists.txt
index 0d3a4ce9bec..19540e67b84 100644
--- a/dep/SFMT/CMakeLists.txt
+++ b/dep/SFMT/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt
index ad3d92933c4..35d70287f88 100644
--- a/dep/bzip2/CMakeLists.txt
+++ b/dep/bzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/fmt/CMakeLists.txt b/dep/fmt/CMakeLists.txt
index 2961a0fc139..b6f8c3e409f 100644
--- a/dep/fmt/CMakeLists.txt
+++ b/dep/fmt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt
index a4ddc9be8c3..a952370c31a 100644
--- a/dep/g3dlite/CMakeLists.txt
+++ b/dep/g3dlite/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt
index 29c54f7c6f3..1c7168d7753 100644
--- a/dep/gsoap/CMakeLists.txt
+++ b/dep/gsoap/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt
index 6362714f2ee..46f513e3f2c 100644
--- a/dep/jemalloc/CMakeLists.txt
+++ b/dep/jemalloc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/mysql/CMakeLists.txt b/dep/mysql/CMakeLists.txt
index a680cb48aee..a54b6e44b9d 100644
--- a/dep/mysql/CMakeLists.txt
+++ b/dep/mysql/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/openssl/CMakeLists.txt b/dep/openssl/CMakeLists.txt
index fe064931b24..22ff0406ea4 100644
--- a/dep/openssl/CMakeLists.txt
+++ b/dep/openssl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/process/CMakeLists.txt b/dep/process/CMakeLists.txt
index 3d84750be7e..d2d25339791 100644
--- a/dep/process/CMakeLists.txt
+++ b/dep/process/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/readline/CMakeLists.txt b/dep/readline/CMakeLists.txt
index 6187be78da0..74d2cdefc43 100644
--- a/dep/readline/CMakeLists.txt
+++ b/dep/readline/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/recastnavigation/CMakeLists.txt b/dep/recastnavigation/CMakeLists.txt
index ab2c5618bfd..1437887c9a7 100644
--- a/dep/recastnavigation/CMakeLists.txt
+++ b/dep/recastnavigation/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
# Copyright (C) 2005-2011 MaNGOS project
#
# This program is free software; you can redistribute it and/or modify
diff --git a/dep/recastnavigation/Detour/CMakeLists.txt b/dep/recastnavigation/Detour/CMakeLists.txt
index 078e39f0a80..64860ab2039 100644
--- a/dep/recastnavigation/Detour/CMakeLists.txt
+++ b/dep/recastnavigation/Detour/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/recastnavigation/Recast/CMakeLists.txt b/dep/recastnavigation/Recast/CMakeLists.txt
index b21c5e38a4f..e7d87c8458c 100644
--- a/dep/recastnavigation/Recast/CMakeLists.txt
+++ b/dep/recastnavigation/Recast/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/threads/CMakeLists.txt b/dep/threads/CMakeLists.txt
index 2a152a135c6..8fa628250fe 100644
--- a/dep/threads/CMakeLists.txt
+++ b/dep/threads/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/utf8cpp/CMakeLists.txt b/dep/utf8cpp/CMakeLists.txt
index 9f2d76cca2f..b55df28fdba 100644
--- a/dep/utf8cpp/CMakeLists.txt
+++ b/dep/utf8cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/valgrind/CMakeLists.txt b/dep/valgrind/CMakeLists.txt
index 104b0dc05ca..b82d18e576e 100644
--- a/dep/valgrind/CMakeLists.txt
+++ b/dep/valgrind/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/zlib/CMakeLists.txt b/dep/zlib/CMakeLists.txt
index 77352d81c82..1d16f7b5a51 100644
--- a/dep/zlib/CMakeLists.txt
+++ b/dep/zlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/zmq/CMakeLists.txt b/dep/zmq/CMakeLists.txt
index 9ba8cc7a1bc..6f0c040fab1 100644
--- a/dep/zmq/CMakeLists.txt
+++ b/dep/zmq/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/zmqpp/CMakeLists.txt b/dep/zmqpp/CMakeLists.txt
index 381d40b42d0..321016f539f 100644
--- a/dep/zmqpp/CMakeLists.txt
+++ b/dep/zmqpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/doc/UnixInstall.txt b/doc/UnixInstall.txt
index d93680d7f72..77a97cab0af 100644
--- a/doc/UnixInstall.txt
+++ b/doc/UnixInstall.txt
@@ -1,15 +1,15 @@
= TrinityCore -- Linux installation =
-Copyright (C) 2008-2017 TrinityCore (http://www.trinitycore.org/)
+Copyright (C) 2008-2018 TrinityCore (https://www.trinitycore.org/)
=========================================================
WARNING: THIS DOCUMENTATION IS NOT ALWAYS UP TO DATE.
FOR MORE UP-TO-DATE INFORMATION, CHECK THE TRINITY WIKI.
=========================================================
-CHECK http://www.trinitycore.info/How-to:Linux FOR FURTHER HELP
+CHECK https://www.trinitycore.info/display/tc/Requirements FOR FURTHER HELP
These are instructions for installation in a Linux environment, if you are
-using Windows refer to http://www.trinitycore.info/How-to:Win
+using Windows refer to https://trinitycore.atlassian.net/wiki/spaces/tc/pages/10977296/Windows+Requirements
Installing TrinityCore is fairly simple on a Linux machine, assuming you
have all required applications
@@ -17,9 +17,9 @@ have all required applications
The most important ones are:
g++
- gcc version 4.3.x or greater
+ gcc version 6.3.x or greater
make
- cmake version 2.6.x or greater
+ cmake version 3.2.x or greater
libmysql++-dev
git (for checking out the core and database)
openssl
diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index e3119121cd3..4422f549d2a 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -7,9 +7,9 @@
#define _SOURCE_DIRECTORY R"(@CMAKE_SOURCE_DIR@)"
#define _BUILD_DIRECTORY R"(@BUILDDIR@)"
#define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE "TDB_full_world_434.25_2017_12_17.sql"
+ #define _FULL_DATABASE "TDB_full_world_434.26_2018_01_15.sql"
#define VER_COMPANYNAME_STR "TrinityCore Developers"
- #define VER_LEGALCOPYRIGHT_STR "(c)2008-2017 TrinityCore"
+ #define VER_LEGALCOPYRIGHT_STR "(c)2008-2018 TrinityCore"
#define VER_FILEVERSION 0,0,0
#define VER_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)"
#define VER_PRODUCTVERSION VER_FILEVERSION
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 82df61f2dcb..d6c676c9747 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -38,7 +38,7 @@ CREATE TABLE `account` (
`failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
`locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
`lock_country` varchar(2) NOT NULL DEFAULT '00',
- `last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `last_login` timestamp NULL,
`online` tinyint(3) unsigned NOT NULL DEFAULT '0',
`expansion` tinyint(3) unsigned NOT NULL DEFAULT '3',
`mutetime` bigint(20) NOT NULL DEFAULT '0',
@@ -212,7 +212,7 @@ CREATE TABLE `battlenet_accounts` (
`failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
`locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
`lock_country` varchar(2) NOT NULL DEFAULT '00',
- `last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `last_login` timestamp NULL,
`online` tinyint(3) unsigned NOT NULL DEFAULT '0',
`locale` tinyint(3) unsigned NOT NULL DEFAULT '0',
`os` varchar(3) NOT NULL DEFAULT '',
@@ -1998,7 +1998,9 @@ INSERT INTO `updates` VALUES
('2017_11_08_00_auth.sql','DB37CC4B077D6C2413F4091E48C3382411F59228','ARCHIVED','2017-11-08 01:40:04',0),
('2017_11_15_00_auth.sql','BF17A1BAF2C3B5A64AEB4DC9C0E46508AA704129','ARCHIVED','2017-10-16 01:40:04',0),
('2017_11_16_00_auth.sql','A53D70B4DB8686AB3A0B0E62471717F4F3902ADD','ARCHIVED','2017-11-16 01:40:04',0),
-('2017_12_17_00_auth.sql','E2EC5999D5305FC12EA576D08EFB95D1660DCF4D','ARCHIVED','2017-12-17 01:40:04',0);
+('2017_12_17_00_auth.sql','E2EC5999D5305FC12EA576D08EFB95D1660DCF4D','ARCHIVED','2017-12-17 01:40:04',0),
+('2018_01_06_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-06 01:40:04',0),
+('2018_01_15_00_auth.sql','1C5C28490B27D86EBC14F6034AA4D34E66D5545D','ARCHIVED','2018-01-15 01:40:04',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f9041f2ea76..a3227a82085 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2874,7 +2874,8 @@ INSERT INTO `updates` VALUES
('2017_11_15_00_characters.sql','22D0C3854EE6D0983CD8C43DF0AC4269386F587C','ARCHIVED','2017-11-15 00:00:00',0),
('2017_11_26_00_characters.sql','4609CDC122E0A7F27A09C2605B329A06FC7FB7C2','ARCHIVED','2017-11-27 00:00:00',0),
('2017_11_28_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-28 00:00:00',0),
-('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0);
+('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0),
+('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 3f526a77e57..90f7c579503 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -785,6 +785,7 @@ CREATE TABLE `game_event` (
`occurence` bigint(20) unsigned NOT NULL DEFAULT '5184000' COMMENT 'Delay in minutes between occurences of the event',
`length` bigint(20) unsigned NOT NULL DEFAULT '2592000' COMMENT 'Length in minutes of the event',
`holiday` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Client side holiday id',
+ `holidayStage` TINYINT UNSIGNED NOT NULL DEFAULT '0' COMMENT '',
`description` varchar(255) DEFAULT NULL COMMENT 'Description of the event displayed in console',
`world_event` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '0 if normal event, 1 if world event',
`announce` tinyint(3) unsigned DEFAULT '2' COMMENT '0 dont announce, 1 announce, 2 value from config',
diff --git a/sql/updates/auth/4.3.4/2017_12_17_00_auth.sql b/sql/old/4.3.4/auth/25_2018_01_15/2017_12_17_00_auth.sql
similarity index 100%
rename from sql/updates/auth/4.3.4/2017_12_17_00_auth.sql
rename to sql/old/4.3.4/auth/25_2018_01_15/2017_12_17_00_auth.sql
diff --git a/sql/old/4.3.4/auth/25_2018_01_15/2018_01_06_00_auth.sql b/sql/old/4.3.4/auth/25_2018_01_15/2018_01_06_00_auth.sql
new file mode 100644
index 00000000000..891380c76be
--- /dev/null
+++ b/sql/old/4.3.4/auth/25_2018_01_15/2018_01_06_00_auth.sql
@@ -0,0 +1,14 @@
+SET @sql_mode = @@session.sql_mode;
+SET SESSION sql_mode = '';
+
+ALTER TABLE `account`
+ CHANGE `last_login` `last_login` TIMESTAMP NULL;
+
+UPDATE `account` SET `last_login`=NULL WHERE `last_login`='0000-00-00 00:00:00';
+
+ALTER TABLE `battlenet_accounts`
+ CHANGE `last_login` `last_login` TIMESTAMP NULL;
+
+UPDATE `battlenet_accounts` SET `last_login`=NULL WHERE `last_login`='0000-00-00 00:00:00';
+
+SET SESSION sql_mode = @@sql_mode;
diff --git a/sql/updates/characters/4.3.4/2017_12_17_00_characters.sql b/sql/old/4.3.4/characters/25_2018_01_15/2017_12_17_00_characters.sql
similarity index 100%
rename from sql/updates/characters/4.3.4/2017_12_17_00_characters.sql
rename to sql/old/4.3.4/characters/25_2018_01_15/2017_12_17_00_characters.sql
diff --git a/sql/updates/world/4.3.4/2017_12_17_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_17_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_17_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_17_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_17_01_world_from_335_was_2017_12_16_03_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_17_01_world_from_335_was_2017_12_16_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_17_01_world_from_335_was_2017_12_16_03_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_17_01_world_from_335_was_2017_12_16_03_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_17_02_world_from_335_was_2017_12_16_04_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_17_02_world_from_335_was_2017_12_16_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_17_02_world_from_335_was_2017_12_16_04_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_17_02_world_from_335_was_2017_12_16_04_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_17_03_world_from_335_was_2017_12_17_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_17_03_world_from_335_was_2017_12_17_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_17_03_world_from_335_was_2017_12_17_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_17_03_world_from_335_was_2017_12_17_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_17_04_world_from_335_was_2017_12_17_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_17_04_world_from_335_was_2017_12_17_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_17_04_world_from_335_was_2017_12_17_01_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_17_04_world_from_335_was_2017_12_17_01_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_18_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_18_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_18_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_18_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_19_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_19_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_19_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_19_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_19_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_19_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_19_01_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_19_01_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2017_12_27_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_27_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_27_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_27_00_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_27_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_27_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_27_01_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_27_01_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_27_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_27_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_27_02_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_27_02_world.sql
diff --git a/sql/updates/world/4.3.4/2017_12_28_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2017_12_28_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_12_28_00_world.sql
rename to sql/old/4.3.4/world/25_2018_01_15/2017_12_28_00_world.sql
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_00_world_from_335_was_2017_12_27_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_00_world_from_335_was_2017_12_27_00_world.sql
new file mode 100644
index 00000000000..3021baaba55
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_00_world_from_335_was_2017_12_27_00_world.sql
@@ -0,0 +1,11 @@
+-- Restore deleted pool
+SET @POOL_1 := 382;
+
+DELETE FROM `pool_template` WHERE `entry`=@POOL_1;
+INSERT INTO `pool_template` VALUES
+(@POOL_1, 1, "Eye of DarKhan/Wailer Spawn 1");
+
+DELETE FROM `pool_creature` WHERE `guid` IN (82897, 85744);
+INSERT INTO `pool_creature` VALUES
+(82897, @POOL_1, 0, "Wailer Spawn 1"),
+(85744, @POOL_1, 0, "Eye of DarKhan Spawn 1");
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_01_world_from_335_was_2017_12_28_00_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_01_world_from_335_was_2017_12_28_00_world_335.sql
new file mode 100644
index 00000000000..db0b4bbea35
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_01_world_from_335_was_2017_12_28_00_world_335.sql
@@ -0,0 +1,4 @@
+DELETE FROM `lfg_dungeon_template` WHERE `dungeonId` IN (30, 276);
+INSERT INTO `lfg_dungeon_template` (`dungeonId`, `name`, `position_x`, `position_y`, `position_z`, `orientation`, `VerifiedBuild`) VALUES
+(30, 'Blackrock Depths - Prison', 456.929, 34.0923, -68.0896, 4.712389, 11159),
+(276, 'Blackrock Depths - Upper City', 456.929, 34.0923, -68.0896, 4.712389, 11159);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_02_world_from_335_was_2017_12_28_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_02_world_from_335_was_2017_12_28_01_world.sql
new file mode 100644
index 00000000000..bc082badcf2
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_02_world_from_335_was_2017_12_28_01_world.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_area` WHERE `spell` IN (30550, 30557, 30562, 30567);
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `raceMask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(30550, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
+(30557, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
+(30562, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
+(30567, 3457, 0, 0, 0, 0, 2, 0, 64, 11);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_03_world_from_335_was_2017_12_28_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_03_world_from_335_was_2017_12_28_02_world.sql
new file mode 100644
index 00000000000..8f580e7362b
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_03_world_from_335_was_2017_12_28_02_world.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=23224;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_04_world_from_335_was_2017_12_28_03_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_04_world_from_335_was_2017_12_28_03_world.sql
new file mode 100644
index 00000000000..c8012633a6e
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_04_world_from_335_was_2017_12_28_03_world.sql
@@ -0,0 +1 @@
+UPDATE `reference_loot_template` SET `Chance` = 40 WHERE `Entry` IN (34278,34279) AND `Item` IN (52025,52028);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_05_world_from_335_was_2017_12_28_04_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_05_world_from_335_was_2017_12_28_04_world.sql
new file mode 100644
index 00000000000..c104e2668f1
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_05_world_from_335_was_2017_12_28_04_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `gameobject` WHERE `id` = 190557 AND `map` = 631;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(1498,190557,631,0,0,15,1,-59.4583,2157.47,30.6542,2.75761,0,0,0,1,6000,100,1,0);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_06_world_from_335_was_2017_12_28_05_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_06_world_from_335_was_2017_12_28_05_world.sql
new file mode 100644
index 00000000000..a1d31371e46
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_06_world_from_335_was_2017_12_28_05_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hor_quel_delars_will';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(70698, 'spell_hor_quel_delars_will');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_07_world_from_335_was_2017_12_28_07_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_07_world_from_335_was_2017_12_28_07_world.sql
new file mode 100644
index 00000000000..d9f92b5b98d
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_07_world_from_335_was_2017_12_28_07_world.sql
@@ -0,0 +1,2 @@
+-- Update spells for Thunder Bluff Kodo
+UPDATE `creature_template` SET `spell1`=62544, `spell3`=62960 WHERE `entry`=33322;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_08_world_from_335_was_2017_12_29_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_08_world_from_335_was_2017_12_29_00_world.sql
new file mode 100644
index 00000000000..b6c0dd3bcb6
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_08_world_from_335_was_2017_12_29_00_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_valanyr_hammer_of_ancient_kings';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64415,'spell_item_valanyr_hammer_of_ancient_kings');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_09_world_from_335_was_2017_12_30_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_09_world_from_335_was_2017_12_30_00_world.sql
new file mode 100644
index 00000000000..83465eb3934
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_09_world_from_335_was_2017_12_30_00_world.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` & 0xFFFFFF7F;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_10_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_10_world.sql
new file mode 100644
index 00000000000..a148d3c3c95
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_10_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `MovementType` = 0 WHERE `guid` = 82823;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_11_world_from_335_was_2018_01_01_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_11_world_from_335_was_2018_01_01_00_world.sql
new file mode 100644
index 00000000000..109071ba4db
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_11_world_from_335_was_2018_01_01_00_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27283 AND `source_type`=0;
+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
+(27283, 0, 0, 0, 0, 0, 100, 0, 1000, 2000, 3400, 4800, 11, 9672, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Risen Wintergarde Mage - IC - Cast 'Frostbolt'"),
+(27283, 0, 1, 0, 0, 0, 100, 0, 8000, 12000, 9000, 14000, 11, 13339, 65, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, "Risen Wintergarde Mage - In Combat - Cast 'Fire Blast'");
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_12_world_from_335_was_2018_01_01_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_12_world_from_335_was_2018_01_01_01_world.sql
new file mode 100644
index 00000000000..32bd6c76e67
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_12_world_from_335_was_2018_01_01_01_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `position_x`=469.25, `position_y`=12.05, `position_z`=49.299, `orientation`=1.5708 WHERE `guid`=10997 AND `id`=21962;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_13_world_from_335_was_2018_01_01_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_13_world_from_335_was_2018_01_01_02_world.sql
new file mode 100644
index 00000000000..892dc419904
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_01_13_world_from_335_was_2018_01_01_02_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry` IN(40495);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_00_world_from_335_was_2018_01_02_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_00_world_from_335_was_2018_01_02_00_world.sql
new file mode 100644
index 00000000000..c987968cf09
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_00_world_from_335_was_2018_01_02_00_world.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellPhaseMask`=0x1,`AttributesMask`=0x2 WHERE `SpellId` IN (44543,44545);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_01_world_from_335_was_2018_01_02_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_01_world_from_335_was_2018_01_02_01_world.sql
new file mode 100644
index 00000000000..9ccc41e9061
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_01_world_from_335_was_2018_01_02_01_world.sql
@@ -0,0 +1,12 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (13,17) AND `SourceEntry`=32307;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 3, 32307, 0, 0, 31, 0, 3, 17148, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Deathsworn.'),
+(13, 3, 32307, 0, 0, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 1, 31, 0, 3, 18658, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Ritualist.'),
+(13, 3, 32307, 0, 1, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 2, 31, 0, 3, 17147, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Cultist.'),
+(13, 3, 32307, 0, 2, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 3, 31, 0, 3, 17146, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Spellbinder.'),
+(13, 3, 32307, 0, 3, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 4, 31, 0, 3, 18391, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Giselda the Crone.'),
+(13, 3, 32307, 0, 4, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_02_world_from_335_was_2018_01_02_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_02_world_from_335_was_2018_01_02_02_world.sql
new file mode 100644
index 00000000000..7fe03e77a5d
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_02_world_from_335_was_2018_01_02_02_world.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_yogg_saron_squeeze';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64125, 'spell_yogg_saron_squeeze'),
+(64126, 'spell_yogg_saron_squeeze');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_03_world_from_335_was_2018_01_02_03_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_03_world_from_335_was_2018_01_02_03_world.sql
new file mode 100644
index 00000000000..7110f22eaf0
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_03_world_from_335_was_2018_01_02_03_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_power_circle';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(45043, 'spell_item_power_circle');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_04_world_from_335_was_2018_01_02_04_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_04_world_from_335_was_2018_01_02_04_world.sql
new file mode 100644
index 00000000000..c1cd0292f19
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_04_world_from_335_was_2018_01_02_04_world.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_group` WHERE `spell_id`=17624;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_05_world_from_335_was_2018_01_02_05_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_05_world_from_335_was_2018_01_02_05_world.sql
new file mode 100644
index 00000000000..7951adb7945
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_05_world_from_335_was_2018_01_02_05_world.sql
@@ -0,0 +1,46 @@
+--
+-- ELM General Purpose Bunny
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23837 AND `source_type`=0 AND `id` IN (7,8);
+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
+(23837,0,7,0,38,0,100,0,29,29,0,0,11,40163,2,0,0,0,0,1,0,0,0,0,0,0,0,"ELM General Purpose Bunny - On Data Set - Cast Teleport"),
+(23837,0,8,0,38,0,100,0,29,29,0,0,50,186943,30,0,0,0,0,1,0,0,0,0,0,0,0,"ELM General Purpose Bunny - On Data Set - Summon Gameobject 'Scuttle's Mop and Bucket'");
+
+-- Scuttle Frostprow
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=24784;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=24784 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2478400 AND `source_type`=9;
+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
+(24784,0,0,0,20,0,100,0,11469,0,0,0,80,2478400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Quest 'Swabbin' Soap' Finished - Run Script"),
+(2478400,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Remove Npc Flag Questgiver"),
+(2478400,9,1,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Say Line 0"),
+(2478400,9,2,0,0,0,100,0,2000,2000,0,0,11,44433,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Cast Summon Swabbin' Mops and Buckets"),
+(2478400,9,3,0,0,0,100,0,3000,3000,0,0,45,29,29,0,0,0,0,11,23837,30,0,0,0,0,0,"Scuttle Frostprow - On Script - Set Data to ELM General Purpose Bunny"),
+(2478400,9,4,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,10,102072,24642,0,0,0,0,0,"Scuttle Frostprow - On Script - Set Data to Drunken Northsea Pirate"),
+(2478400,9,5,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Say Line 1"),
+(2478400,9,6,0,0,0,100,0,24000,24000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Add Npc Flag Questgiver");
+
+-- Drunken Northsea Pirate
+DELETE FROM `smart_scripts` WHERE `entryorguid`=-102072 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2464200 AND `source_type`=9;
+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
+(-102072,0,0,0,1,1,50,0,0,45000,90000,180000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Drunken Northsea Pirate - Out of Combat - Say Line 0'),
+(-102072,0,1,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Drunken Northsea Pirate - On Respawn - Set Event Phase 1'),
+(-102072,0,2,0,38,0,100,0,1,1,0,0,80,2464200,0,0,0,0,0,1,0,0,0,0,0,0,0,'Drunken Northsea Pirate - On Data Set - Run Script'),
+(2464200,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Event Phase 0"),
+(2464200,9,1,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Say Line 1"),
+(2464200,9,2,0,0,0,100,0,7000,7000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.64061,"Drunken Northsea Pirate - On Script - Set Orientation"),
+(2464200,9,3,0,0,0,100,0,1000,1000,0,0,11,44435,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Cast 'Swabbin' Soap: Drunken Northsea Pirate Throws Bottle'"),
+(2464200,9,4,0,0,0,100,0,0,0,0,0,40,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Sheath Unarmed"),
+(2464200,9,5,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Say Line 2"),
+(2464200,9,6,0,0,0,100,0,15000,15000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.18879,"Drunken Northsea Pirate - On Script - Set Orientation"),
+(2464200,9,7,0,0,0,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Sheath Melee"),
+(2464200,9,8,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Event Phase 0");
+
+-- Texts
+DELETE FROM `creature_text` WHERE `CreatureID`=24784;
+DELETE FROM `creature_text` WHERE `CreatureID`=24642 AND `GroupID` IN (1,2);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(24784,0,0,"There we go, $n! This fat'll do the trick fer sure! And now for some real swabbin'!",12,0,100,1,0,0,23831,0,"Scuttle Frostprow"),
+(24784,1,0,"Look at 'em go! Spotless!",12,0,100,4,0,0,23832,0,"Scuttle Frostprow"),
+(24642,1,0,"What ...hic?!",12,0,100,5,0,0,23834,0,"Drunken Northsea Pirate"),
+(24642,2,0,"That's it... no more grog for me!",12,0,100,1,0,0,23835,0,"Drunken Northsea Pirate");
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_06_world_from_335_was_2018_01_02_06_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_06_world_from_335_was_2018_01_02_06_world.sql
new file mode 100644
index 00000000000..7bd7993b69e
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_06_world_from_335_was_2018_01_02_06_world.sql
@@ -0,0 +1,2 @@
+-- Dream Vision
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=7863;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_07_world_from_335_was_2018_01_02_07_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_07_world_from_335_was_2018_01_02_07_world.sql
new file mode 100644
index 00000000000..61e30a5dbe5
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_07_world_from_335_was_2018_01_02_07_world.sql
@@ -0,0 +1,2 @@
+-- 'Cabal Agent' is not a CIVILIAN
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`&(~2) WHERE `entry`=19503;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_08_world_from_335_was_2018_01_02_08_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_08_world_from_335_was_2018_01_02_08_world.sql
new file mode 100644
index 00000000000..2c1c824a91f
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_08_world_from_335_was_2018_01_02_08_world.sql
@@ -0,0 +1,5 @@
+-- Add condition to gossip text of Thassarian
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=9840;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14, 9840, 13609, 0, 0, 8, 0, 12019, 0, 0, 0, 0, 0, "", "Gossip if quest=12019 is completed"),
+(14, 9840, 13608, 0, 0, 8, 0, 12019, 0, 0, 1, 0, 0, "", "Gossip if quest=12019 isn't completed");
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_09_world_from_335_was_2018_01_02_09_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_09_world_from_335_was_2018_01_02_09_world.sql
new file mode 100644
index 00000000000..f44ec2ff595
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_03_09_world_from_335_was_2018_01_02_09_world.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellPhaseMask`=0x1 WHERE `SpellId`=-51521;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_00_world.sql
new file mode 100644
index 00000000000..d15d303ca78
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_00_world.sql
@@ -0,0 +1,11 @@
+SET @sql_mode = @@session.sql_mode;
+SET SESSION sql_mode = '';
+
+ALTER TABLE `game_event`
+ CHANGE `start_time` `start_time` TIMESTAMP NULL COMMENT 'Absolute start date, the event will never start before',
+ CHANGE `end_time` `end_time` TIMESTAMP NULL COMMENT 'Absolute end date, the event will never start after';
+
+UPDATE `game_event` SET `start_time`=NULL WHERE `start_time`='0000-00-00 00:00:00';
+UPDATE `game_event` SET `end_time`=NULL WHERE `end_time`='0000-00-00 00:00:00';
+
+SET SESSION sql_mode = @@sql_mode;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_01_world.sql
new file mode 100644
index 00000000000..d1b3e2af7af
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_01_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `event_scripts` WHERE `id`=17209 AND `command`=8;
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(17209, 1, 8, 27995, 1, 0, 0, 0, 0, 0);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_02_world.sql
new file mode 100644
index 00000000000..6faf89bdc2f
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_06_02_world.sql
@@ -0,0 +1,9 @@
+--
+DELETE FROM `quest_template_addon` WHERE `ID` IN (26150, 46);
+INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
+(26150,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0),
+(46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+
+DELETE FROM `creature_loot_template` WHERE `Entry`=13159 AND `Item`=1307;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(13159,1307,0,100,0,1,0,1,1,NULL);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_00_world_from_335_was_2018_01_06_00_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_00_world_from_335_was_2018_01_06_00_world_335.sql
new file mode 100644
index 00000000000..ee849e097fc
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_00_world_from_335_was_2018_01_06_00_world_335.sql
@@ -0,0 +1,19 @@
+/*
+-- Remove unique items from reference table 24077
+DELETE FROM `reference_loot_template` WHERE `Entry`=24077 AND `Item` IN (827, 1214, 1219, 1405, 1925, 1928, 1958, 1959, 4676);
+-- Add former items from reference table 24077 to their proper NPCs
+DELETE FROM `creature_loot_template` WHERE `Item` IN (827, 1214, 1219, 1405, 1925, 1928, 1958, 1959, 4676);
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Chance`, `LootMode`, `MinCount`, `MaxCount`, `GroupId`, `Comment`) VALUES
+(122, 827, 0.1, 1, 1, 1, 0, 'Defias Highwayman - Wicked Blackjack'),
+(449, 827, 0.1, 1, 1, 1, 0, 'Defias Knuckleduster - Wicked Blackjack'),
+(426, 1214, 0.1, 1, 1, 1, 0, 'Redridge Brute - Gnoll Punisher'),
+(424, 1219, 0.1, 1, 1, 1, 0, 'Redridge Poacher - Redridge Machete'),
+(517, 1405, 0.1, 1, 1, 1, 0, 'Murloc Oracle - Foamspittle Staff'),
+(1725, 1925, 0.1, 1, 1, 1, 0, 'Defias Watchman - Defias Rapier'),
+(1726, 1928, 0.1, 1, 1, 1, 0, 'Defias Magician - Defias Mage Staff'),
+(623, 1958, 0.1, 1, 1, 1, 2, 'Skeletal Miner - Petrified Shinbone'),
+(623, 1959, 0.1, 1, 1, 1, 2, 'Skeletal Miner - Cold Iron Pick'),
+(624, 1958, 0.1, 1, 1, 1, 2, 'Undead Excavator - Petrified Shinbone'),
+(624, 4676, 0.1, 1, 1, 1, 2, 'Undead Excavator - Skeletal Gauntlets'),
+(625, 1958, 0.1, 1, 1, 1, 0, 'Undead Dynamiter - Petrified Shinbone');
+*/
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_01_world_from_335_was_2018_01_06_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_01_world_from_335_was_2018_01_06_01_world.sql
new file mode 100644
index 00000000000..f27ec49887a
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_01_world_from_335_was_2018_01_06_01_world.sql
@@ -0,0 +1,3 @@
+-- Stabled Argent Warhorse
+DELETE FROM `conditions` WHERE `SourceGroup`=33870 AND `SourceTypeOrReferenceId`=18 AND SourceEntry=63663;
+INSERT INTO `conditions` VALUES (18,33870,63663,0,0,9,0,13664,0,0,0,0,0,'','Spellclick requires quest 13664 active');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_02_world_from_335_was_2018_01_07_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_02_world_from_335_was_2018_01_07_00_world.sql
new file mode 100644
index 00000000000..530233f8fe5
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_02_world_from_335_was_2018_01_07_00_world.sql
@@ -0,0 +1,32 @@
+-- Ruby Sanctum white damage update
+UPDATE `creature_template` SET `DamageModifier`=114 WHERE `entry` IN (39863,40142); -- Halion/Halion Twilight 10N
+UPDATE `creature_template` SET `DamageModifier`=172 WHERE `entry` IN (39864,40143); -- Halion/Halion Twilight 25N
+UPDATE `creature_template` SET `DamageModifier`=172 WHERE `entry` IN (39944,40144); -- Halion/Halion Twilight 10H
+UPDATE `creature_template` SET `DamageModifier`=257 WHERE `entry` IN (39945,40145); -- Halion/Halion Twilight 25H
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39746; -- General Zarithrian 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39805; -- General Zarithrian 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39747; -- Saviana Ragefire 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39823; -- Saviana Ragefire 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39751; -- Baltharus the Warborn 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39920; -- Baltharus the Warborn 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39899; -- Baltharus Clone 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39922; -- Baltharus Clone 25
+
+UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (40429); -- Sanctum Guardian Xerestrasza
+
+-- Trash Mobs: Charscale Invoker, Charscale Assaulter, Charscale Elite, Charscale Commander
+UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (40417,40419,40421,40423); -- 10
+UPDATE `creature_template` SET `DamageModifier`= 40 WHERE `entry` IN (40418,40420,40422,40424); -- 25
+
+-- Ruby Drakonid, Ruby Drake, Ruby Scalebane, Ruby Dragon
+UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (40626,40627,40628,40870);
+
+UPDATE `creature_template` SET `DamageModifier`= 14 WHERE `entry`=40683; -- Living Ember 10
+UPDATE `creature_template` SET `DamageModifier`= 22 WHERE `entry`=40684; -- Living Ember 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=40681; -- Living Inferno 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=40682; -- Living Inferno 25
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_03_world_from_335_was_2018_01_07_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_03_world_from_335_was_2018_01_07_01_world.sql
new file mode 100644
index 00000000000..deaef4caeec
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_03_world_from_335_was_2018_01_07_01_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `linked_respawn` WHERE `guid`=79370 AND `linkedGuid`=79336;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_04_world_from_335_was_2018_01_07_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_04_world_from_335_was_2018_01_07_02_world.sql
new file mode 100644
index 00000000000..e06e2d13d1d
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_04_world_from_335_was_2018_01_07_02_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template_addon` SET `auras`='32811' WHERE `entry` IN (20882,21613); -- Skulking Witch (Normal,Heroic)
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_05_world_from_335_was_2018_01_09_01_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_05_world_from_335_was_2018_01_09_01_world_335.sql
new file mode 100644
index 00000000000..ac49cf75c6e
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_05_world_from_335_was_2018_01_09_01_world_335.sql
@@ -0,0 +1,44 @@
+/*
+-- Chemist Cuely
+DELETE FROM `creature_text` WHERE `CreatureID`=8390;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(8390,0,0,"There! Job's done.",12,0,100,1,0,0,4522,0,'Chemist Cuely');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=8390;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8390 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=839000 AND `source_type`=9;
+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
+(8390,0,0,0,20,0,100,0,3568,0,0,0,80,839000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chemist Cuely - On Quest 'Seeping Corruption' Finished - Run Script"),
+(839000,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chemist Cuely - On Script - Remove Npc Flag Questgiver"),
+(839000,9,1,0,0,0,100,0,0,0,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chemist Cuely - On Script - Set Emote State 133"),
+(839000,9,2,0,0,0,100,0,5000,5000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chemist Cuely - On Script - Set Emote State 0"),
+(839000,9,3,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chemist Cuely - On Script - Say Line 0"),
+(839000,9,4,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chemist Cuely - On Script - Add Npc Flag Questgiver");
+
+-- Thersa Windsong
+DELETE FROM `creature_text` WHERE `CreatureID`=8393;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(8393,0,0,"Wha... what's happening?",12,0,100,15,0,0,4533,0,'Thersa Windsong');
+
+UPDATE `creature` SET `spawntimesecs`= 30 WHERE `guid`=31905;
+UPDATE `creature_addon` SET `auras`=19502 WHERE `guid`=31905;
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=8393;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8393 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=839300 AND `source_type`=9;
+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
+(8393,0,0,0,20,0,100,0,3569,0,0,0,80,839300,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thersa Windsong - On Quest 'Seeping Corruption (Part 2)' Finished - Run Script"),
+(8393,0,1,0,6,0,100,0,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thersa Windsong - On Just Died - Despawn In 5000 ms"),
+(839300,9,0,0,0,0,100,0,0,0,0,0,5,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thersa Windsong - On Script - Play Emote 7"),
+(839300,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thersa Windsong - On Script - Say Line 0"),
+(839300,9,2,0,0,0,100,0,3000,3000,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thersa Windsong - On Script - Kill Self");
+
+-- Quest "Seeping Corruption (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=3569;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(3569,1,11,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=3569;
+
+-- Quest "Seeping Corruption (Part 3)"
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=11, `RewardText`="I never dreamed the elixir would take hold that quickly. Thank you, $n. I will get to work on the rest of these samples right away. I'm sure they'll be usable by the Lady Sylvanas and the Forsaken soon enough." WHERE `ID`=3570;
+*/
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_06_world_from_335_was_2018_01_09_02_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_06_world_from_335_was_2018_01_09_02_world_335.sql
new file mode 100644
index 00000000000..3c2e95045c0
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_06_world_from_335_was_2018_01_09_02_world_335.sql
@@ -0,0 +1,762 @@
+/*
+-- Quest: Alliance Relations
+DELETE FROM `quest_details` WHERE `ID`=1431;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1431,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1431;
+
+-- Quest: Alliance Relations (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=1432;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1432,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1432;
+
+-- Quest: Alliance Relations (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=1433;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1433,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1433;
+
+-- Quest: The Burning of Spirits
+DELETE FROM `quest_details` WHERE `ID`=1435;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1435,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1435;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1435;
+
+-- Quest: Alliance Relations (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=1436;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1436,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=1436;
+
+-- Quest: Catch of the Day
+DELETE FROM `quest_details` WHERE `ID`=5386;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5386,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=5386;
+
+-- Quest: Befouled by Satyr
+DELETE FROM `quest_details` WHERE `ID`=1434;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1434,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1434;
+
+-- Quest: Kodo Roundup
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5561;
+
+-- Quest: Bone Collector
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5501;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=5501;
+
+-- Quest: Khan Dez'hepah
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1365;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1365;
+
+-- Quest: Centaur Bounty
+DELETE FROM `quest_details` WHERE `ID`=1366;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1366,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1366;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=66 WHERE `ID`=1366;
+
+-- Quest: The Corrupter
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1480;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1480;
+
+-- Quest: The Corrupter (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=1481;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1481,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1481;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1481;
+
+-- Quest: The Corrupter (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=1482;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1482,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1482;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1482;
+
+-- Quest: The Corrupter (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=1484;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1484,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1484;
+
+-- Quest: The Corrupter (Part 5)
+DELETE FROM `quest_details` WHERE `ID`=1488;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1488,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=15 WHERE `ID`=1488;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1 WHERE `ID`=1488;
+
+-- Quest: Hunting in Stranglethorn
+DELETE FROM `quest_details` WHERE `ID`=5763;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5763,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=5763;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5763;
+
+-- Quest: Hand of Iruxos
+DELETE FROM `quest_details` WHERE `ID`=5381;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5381,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5381;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5381;
+
+-- Quest: Portals of the Legion
+DELETE FROM `quest_details` WHERE `ID`=5581;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5581,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=5581;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=5581;
+
+-- Quest: Other Fish to Fry
+DELETE FROM `quest_details` WHERE `ID`=6143;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(6143,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6143;
+
+-- Quest: Clam Bait
+DELETE FROM `quest_details` WHERE `ID`=6142;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(6142,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6142;
+
+-- Quest: Fish in a Bucket
+UPDATE `quest_request_items` SET `EmoteOnComplete`=1, `EmoteOnIncomplete`=1 WHERE `ID`=5421;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5421;
+
+-- Quest: Sceptre of Light
+UPDATE `quest_details` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=5741;
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6, `CompletionText`="Do you have the Sceptre of Light?" WHERE `ID`=5741;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5741;
+
+-- Quest: Book of the Ancients
+DELETE FROM `quest_details` WHERE `ID`=6027;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(6027,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `CompletionText`="Ah, $N! It's good to see you again. Do you have the Book of the Ancients?" WHERE `ID`=6027;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=6027;
+
+-- Quest: Twisted Evils
+UPDATE `quest_details` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=7028;
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=25 WHERE `ID`=7028;
+UPDATE `quest_offer_reward` SET `Emote1`=11 WHERE `ID`=7028;
+
+-- Quest: Ghost-o-plasm Round Up
+DELETE FROM `quest_details` WHERE `ID`=6134;
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=6134;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1 WHERE `ID`=6134;
+
+-- Quest: Get Me Out of Here!
+DELETE FROM `quest_details` WHERE `ID`=6132;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(6132,5,0,0,0,0,0,0,0,0);
+
+-- Quest: Vyletongue Corruption
+DELETE FROM `quest_details` WHERE `ID`=7029;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(7029,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=7029;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=7029;
+
+-- Quest: Steelsnap
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1131;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1131;
+
+-- Quest: The Sacred Flame
+DELETE FROM `quest_details` WHERE `ID`=1195;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1195,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1195;
+
+-- Quest: The Sacred Flame (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=1196;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1196,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1196;
+
+-- Quest: The Sacred Flame (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=1197;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1197,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1197;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1197;
+
+-- Quest: Message to Freewind Post
+DELETE FROM `quest_details` WHERE `ID`=4542;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4542,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=4542;
+
+-- Quest: Pacify the Centaur
+DELETE FROM `quest_details` WHERE `ID`=4841;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4841,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=25 WHERE `ID`=4841;
+
+-- Quest: Grimtotem Spying
+DELETE FROM `quest_details` WHERE `ID`=5064;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5064,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=5064;
+
+-- Quest: Alien Egg
+DELETE FROM `quest_details` WHERE `ID`=4821;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4821,2,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=4821;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=4821;
+
+-- Quest: Serpent Wild
+DELETE FROM `quest_details` WHERE `ID`=4865;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4865,1,5,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=4865;
+
+-- Quest: Sacred Fire
+DELETE FROM `quest_details` WHERE `ID`=5062;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5062,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5062;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5062;
+
+-- Quest: Arikara
+DELETE FROM `quest_details` WHERE `ID`=5088;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5088,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=5088;
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=2 WHERE `ID`=5088;
+
+-- Quest: Wind Rider
+DELETE FROM `quest_details` WHERE `ID`=4767;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4767,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=4767;
+
+-- Quest: A Different Approach
+DELETE FROM `quest_details` WHERE `ID`=9431;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(9431,6,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=9431;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9431;
+
+-- Quest: A Dip in the Moonwell
+DELETE FROM `quest_details` WHERE `ID`=9433;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(9433,5,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=9433;
+
+-- Quest: Testing the Tonic
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=9434;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=9434;
+
+-- Quest: Test of Faith
+DELETE FROM `quest_details` WHERE `ID`=1149;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1149,2,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1149;
+
+-- Quest: Test of Endurance
+DELETE FROM `quest_details` WHERE `ID`=1150;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1150,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1150;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1150;
+
+-- Quest: Test of Strength
+DELETE FROM `quest_details` WHERE `ID`=1151;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1151,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1151;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1151;
+
+-- Quest: Test of Lore
+UPDATE `quest_details` SET `Emote1`=1 WHERE `ID`=1152;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1152;
+
+-- Quest: Test of Lore (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=1154;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1154,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1154;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1154;
+
+-- Quest: Test of Lore (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=6627;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(6627,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=6627;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6627;
+
+-- Quest: Test of Lore (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=1159;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1159,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=274, `EmoteDelay2`=2000 WHERE `ID`=1159;
+
+-- Quest: Test of Lore (Part 5)
+DELETE FROM `quest_details` WHERE `ID`=1160;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1160,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1160;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1160;
+
+-- Quest: Test of Lore (Part 6)
+DELETE FROM `quest_details` WHERE `ID`=6628;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(6628,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=6628;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=6628;
+
+-- Quest: Final Passage
+DELETE FROM `quest_details` WHERE `ID`=1394;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1394,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=1394;
+
+-- Quest: Homeward Bound
+UPDATE `quest_details` SET `Emote1`=20 WHERE `ID`=4770;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=4770;
+
+-- Quest: Free at Last
+DELETE FROM `quest_details` WHERE `ID`=4904;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4904,1,0,0,0,0,0,0,0,0);
+
+-- Quest: Assassination Plot
+UPDATE `quest_offer_reward` SET `Emote1`=11, `EmoteDelay1`=1000 WHERE `ID`=4881;
+
+-- Quest: Protect Kanati Greycloud
+DELETE FROM `quest_details` WHERE `ID`=4966;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(4966,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=4966;
+
+-- Quest: Hypercapacitor Gizmo
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5151;
+
+-- Quest: Wanted - Arnak Grimtotem
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5147;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5147;
+
+-- Quest: Family Tree
+DELETE FROM `quest_details` WHERE `ID`=5361;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5361,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5361;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=5361;
+
+-- Quest: A Bump in the Road
+DELETE FROM `quest_details` WHERE `ID`=1175;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1175,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1175;
+
+-- Quest: Hardened Shells
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1105;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=5, `Emote3`=11, `RewardText`="You got them! Thanks, $N!$B$BWow, these shells are harder than I thought! When I work with them I'll probably need a whole box full of tools!" WHERE `ID`=1105;
+
+-- Quest: Salt Flat Venom
+DELETE FROM `quest_details` WHERE `ID`=1104;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1104,5,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1104;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1104;
+
+-- Quest: Wharfmaster Dizzywig
+DELETE FROM `quest_details` WHERE `ID`=1111;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1111,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1111;
+
+-- Quest: Parts for Kravel
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1112;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1112;
+
+-- Quest: Delivery to the Gnomes
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1114;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1114;
+
+-- Quest: Rocket Car Parts
+DELETE FROM `quest_details` WHERE `ID`=1110;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1110,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1110;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1110;
+
+-- Quest: Hemet Nesingwary Jr.
+DELETE FROM `quest_details` WHERE `ID`=5762;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(5762,1,0,0,0,0,0,0,0,0);
+
+-- Quest: Load Lightening
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=1176;
+
+-- Quest: Encrusted Tail Fins
+UPDATE `quest_details` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=1107;
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1107;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1107;
+
+-- Quest: Martek the Exiled
+UPDATE `quest_details` SET `Emote1`=1 WHERE `ID`=1106;
+UPDATE `quest_request_items` SET `EmoteOnComplete`=35 WHERE `ID`=1106;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1106;
+
+-- Quest: Indurium
+DELETE FROM `quest_details` WHERE `ID`=1108;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1108,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1108;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1108;
+
+-- Quest: News for Fizzle
+DELETE FROM `quest_details` WHERE `ID`=1137;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1137,5,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=1137;
+
+-- Quest: The Swarm Grows (Part 2)
+UPDATE `quest_request_items` SET `EmoteOnComplete`=1 WHERE `ID`=1146;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1146;
+
+-- Quest: The Swarm Grows (Part 3)
+UPDATE `quest_offer_reward` SET `Emote3`=1, `Emote4`=2 WHERE `ID`=1147;
+
+-- Quest: Parts of the Swarm
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1148;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1148;
+
+-- Quest: Parts of the Swarm (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=1184;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1184,1,0,0,0,0,0,0,0,0);
+
+-- Quest: The Brassbolts Brothers
+DELETE FROM `quest_details` WHERE `ID`=2769;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(2769,6,1,1,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=2769;
+
+-- Quest: Gahz'rilla
+DELETE FROM `quest_details` WHERE `ID`=2770;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(2770,1,1,5,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=2770;
+
+-- Quest: The Rumormonger
+DELETE FROM `quest_details` WHERE `ID`=1115;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1115,1,0,0,0,0,0,0,0,0);
+
+-- Quest: Dream Dust in the Swamp
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1116;
+
+-- Quest: Rumors for Kravel
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1117;
+
+-- Quest: Back to Booty Bay
+DELETE FROM `quest_details` WHERE `ID`=1118;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1118,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=3 WHERE `ID`=1118;
+
+-- Quest: Zanzil's Mixture and a Fool's Stout
+UPDATE `quest_request_items` SET `EmoteOnComplete`=3 WHERE `ID`=1119;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1119;
+
+-- Quest: Get the Goblins Drunk
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1121;
+
+-- Quest: Get the Gnomes Drunk
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1120;
+
+-- Quest: Report Back to Fizzlebub
+DELETE FROM `quest_details` WHERE `ID`=1122;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(1122,11,1,0,0,0,0,0,0,0);
+
+-- Quest: Goblin Sponsorship
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1180;
+
+-- Quest: Goblin Sponsorship (Part 3)
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1182;
+
+-- Quest: The Eighteenth Pilot
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1186;
+
+-- Quest: Razzeric's Tweaking
+DELETE FROM `quest_details` WHERE `ID`=1187;
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1187;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1187;
+
+-- Quest: Safety First
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1188;
+
+-- Quest: Welcome to the Jungle
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=583;
+
+-- Quest: Raptor Mastery
+DELETE FROM `quest_details` WHERE `ID`=194;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(194,6,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=194;
+
+-- Quest: Raptor Mastery (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=195;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(195,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=195;
+
+-- Quest: Raptor Mastery (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=196;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(196,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=196;
+
+-- Quest: Raptor Mastery (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=197;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(197,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=197;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=197;
+
+-- Quest: Tiger Mastery
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=185;
+
+-- Quest: Tiger Mastery (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=186;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(186,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=186;
+
+-- Quest: Tiger Mastery (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=187;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(187,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=187;
+
+-- Quest: Tiger Mastery (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=188;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(188,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=188;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=188;
+
+-- Quest: Panther Mastery
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=190;
+
+-- Quest: Panther Mastery (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=191;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(191,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=191;
+
+-- Quest: Panther Mastery (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=192;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(192,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=192;
+
+-- Quest: Panther Mastery (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=193;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(193,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=193;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=193;
+
+-- Quest: Big Game Hunter
+DELETE FROM `quest_details` WHERE `ID`=208;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(208,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=208;
+UPDATE `quest_offer_reward` SET `Emote1`=21, `Emote2`=1, `Emote3`=1, `Emote4`=4 WHERE `ID`=208;
+
+-- Quest: The Green Hills of Stranglethorn
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=338;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=338;
+
+-- Quest: Mok'thardin's Enchantment
+DELETE FROM `quest_details` WHERE `ID`=570;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(570,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=570;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=570;
+
+-- Quest: Mok'thardin's Enchantment (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=572;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(572,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=572;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=572;
+
+-- Quest: Mok'thardin's Enchantment (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=571;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(571,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=571;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=571;
+
+-- Quest: Mok'thardin's Enchantment (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=573;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(573,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=573;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=66 WHERE `ID`=573;
+
+-- Quest: The Defense of Grom'gol
+DELETE FROM `quest_details` WHERE `ID`=568;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(568,66,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=568;
+
+-- Quest: The Defense of Grom'gol (Part 2)
+DELETE FROM `quest_details` WHERE `ID`=569;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(569,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=569;
+UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=569;
+
+-- Quest: Grim Message
+DELETE FROM `quest_details` WHERE `ID`=2932;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(2932,1,5,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2932;
+
+-- Quest: Hunt for Yenniku
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=581;
+
+-- Quest: Bloody Bone Necklaces
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=596;
+
+-- Quest: The Vile Reef
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=629;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote1`=2 WHERE `ID`=629;
+
+-- Quest: Venture Company Mining
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=600;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=600;
+
+-- Quest: Scaring Shaky
+UPDATE `quest_request_items` SET `EmoteOnComplete`=25, `EmoteOnIncomplete`=25 WHERE `ID`=606;
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=606;
+
+-- Quest: Return to MacKinley
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=607;
+UPDATE `quest_offer_reward` SET `Emote1`=11 WHERE `ID`=607;
+
+-- Quest: The Bloodsail Buccaneers (Part 1)
+DELETE FROM `quest_details` WHERE `ID`=595;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(595,1,0,0,0,0,0,0,0,0);
+
+-- Quest: The Bloodsail Buccaneers (Part 3)
+DELETE FROM `quest_details` WHERE `ID`=599;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(599,5,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=599;
+
+-- Quest: The Bloodsail Buccaneers (Part 4)
+DELETE FROM `quest_details` WHERE `ID`=604;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(604,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=604;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=604;
+
+-- Quest: The Bloodsail Buccaneers (Part 5)
+DELETE FROM `quest_details` WHERE `ID`=608;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(608,5,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=608;
+
+-- Quest: Whiskey Slim's Lost Grog
+UPDATE `quest_details` SET `Emote1`=1 WHERE `ID`=580;
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=580;
+
+-- Quest: Stoley's Debt
+DELETE FROM `quest_details` WHERE `ID`=2872;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(2872,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2872;
+
+-- Quest: Stoley's Shipment
+DELETE FROM `quest_details` WHERE `ID`=2873;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(2873,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=2873;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=2873;
+
+-- Quest: Deliver to MacKinley
+DELETE FROM `quest_details` WHERE `ID`=2874;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(2874,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=2874;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2874;
+
+-- Quest: Keep An Eye Out
+DELETE FROM `quest_details` WHERE `ID`=576;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(576,6,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=3, `EmoteOnIncomplete`=3 WHERE `ID`=576;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=576;
+
+-- Quest: Up to Snuff
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=587;
+
+-- Quest: Hostile Takeover
+UPDATE `quest_request_items` SET `EmoteOnComplete`=5, `EmoteOnIncomplete`=5 WHERE `ID`=213;
+
+-- Quest: Bloodscalp Ears
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=189;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=189;
+
+-- Quest: Skullsplitter Tusks
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=209;
+
+-- Quest: Akiris by the Bundle
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=617;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=617;
+
+-- Quest: Split Bone Necklace
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=598;
+
+-- Quest: Message in a Bottle
+DELETE FROM `quest_details` WHERE `ID`=630;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(630,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=630;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=630;
+
+-- Quest: The Captain's Chest
+DELETE FROM `quest_details` WHERE `ID`=614;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(614,1,5,0,0,0,2000,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=3, `EmoteOnIncomplete`=3 WHERE `ID`=614;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=614;
+
+-- Quest: The Monogrammed Sash
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=8552;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=8552;
+
+-- Quest: The Captain's Cutlass
+DELETE FROM `quest_details` WHERE `ID`=8553;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(8553,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=3 WHERE `ID`=8553;
+
+-- Quest: Facing Negolash
+DELETE FROM `quest_details` WHERE `ID`=8554;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(8554,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=8554;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1, `Emote3`=2 WHERE `ID`=8554;
+
+-- Quest: Cracking Maury's Foot
+DELETE FROM `quest_details` WHERE `ID`=613;
+INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
+(613,5,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=613;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=613;
+*/
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_07_world_from_335_was_2018_01_09_03_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_07_world_from_335_was_2018_01_09_03_world_335.sql
new file mode 100644
index 00000000000..c27e484f20a
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_07_world_from_335_was_2018_01_09_03_world_335.sql
@@ -0,0 +1,26 @@
+/*
+-- Witch Doctor Uzer'i
+DELETE FROM `creature_text` WHERE `CreatureID`=8115 AND `GroupID` IN (0,1);
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(8115,0,0,"%s begins the ritual.",16,0,100,0,0,0,4181,0,"Witch Doctor Uzer'i"),
+(8115,1,0,"The muisek vessels are now ready, $n.",12,0,100,0,0,0,4180,0,"Witch Doctor Uzer'i");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=8115;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8115 AND `source_type`=0 AND `id`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=811500 AND `source_type`=9;
+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
+(8115,0,0,0,20,0,100,0,3122,0,0,0,80,811500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Quest 'Return to Witch Doctor Uzer'i' Finished - Run Script"),
+(811500,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Remove Npc Flag Questgiver+Gossip"),
+(811500,9,1,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4388.65,274.297,25.4396,0,"Witch Doctor Uzer'i - On Script - Move to Position"),
+(811500,9,2,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Say Line 0"),
+(811500,9,3,0,0,0,100,0,0,0,0,0,17,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Set Emote State 'Cheer'"),
+(811500,9,4,0,0,0,100,0,6500,6500,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Set Emote State 'None'"),
+(811500,9,5,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-4391.53,274.703,25.6304,0,"Witch Doctor Uzer'i - On Script - Move to Position"),
+(811500,9,6,0,0,0,100,0,1500,1500,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.59658,"Witch Doctor Uzer'i - On Script - Set Orientation"),
+(811500,9,7,0,0,0,100,0,500,500,0,0,17,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Set Emote State 'Dance'"),
+(811500,9,8,0,0,0,100,0,10000,10000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Set Emote State 'None'"),
+(811500,9,9,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-4375.68,269.717,25.4947,0,"Witch Doctor Uzer'i - On Script - Move to Position"),
+(811500,9,10,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Say Line 1"),
+(811500,9,11,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.72984,"Witch Doctor Uzer'i - On Script - Set Orientation"),
+(811500,9,12,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witch Doctor Uzer'i - On Script - Add Npc Flag Questgiver+Gossip");
+*/
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_08_world_from_335_was_2018_01_10_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_08_world_from_335_was_2018_01_10_00_world.sql
new file mode 100644
index 00000000000..275dbe01224
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_08_world_from_335_was_2018_01_10_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `unit_flags2` = `unit_flags2`|0x8000 WHERE `entry`=32930;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_09_world_from_335_was_2018_01_10_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_09_world_from_335_was_2018_01_10_01_world.sql
new file mode 100644
index 00000000000..ab111f0fc12
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_09_world_from_335_was_2018_01_10_01_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `unit_flags2` = `unit_flags2`|0x8000 WHERE `entry`=33909;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_10_world_from_335_was_2018_01_10_02_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_10_world_from_335_was_2018_01_10_02_world_335.sql
new file mode 100644
index 00000000000..b4dbe456119
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_10_world_from_335_was_2018_01_10_02_world_335.sql
@@ -0,0 +1,10 @@
+/*
+-- Witch Doctor Uzer'i --> Add Gossip Option
+DELETE FROM `gossip_menu` WHERE `MenuID`=1289;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(1289,1924,0);
+
+DELETE FROM `gossip_menu_option` WHERE `MenuID`=1141;
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+(1141,0,0,"Tell me more about muisek.",4419,1,1,1289,0,0,0,"",0,0);
+*/
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_11_world_from_335_was_2018_01_10_03_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_11_world_from_335_was_2018_01_10_03_world_335.sql
new file mode 100644
index 00000000000..17dea2186f4
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_11_world_from_335_was_2018_01_10_03_world_335.sql
@@ -0,0 +1,2 @@
+-- Ag'tor Bloodfist --> Fix Gossip Text
+-- UPDATE `gossip_menu` SET `TextID`=2033 WHERE `MenuID`=1401;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_12_world_from_335_was_2018_01_10_04_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_12_world_from_335_was_2018_01_10_04_world_335.sql
new file mode 100644
index 00000000000..659f3e33202
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_12_world_from_335_was_2018_01_10_04_world_335.sql
@@ -0,0 +1,128 @@
+/*
+-- Zukk'ash Stinger
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5244 AND `source_type`=0 AND `id` IN (1,2);
+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
+(5244,0,1,0,2,0,100,1,0,15,0,0,11,17170,0,0,0,0,0,2,0,0,0,0,0,0,0,"Zukk'ash Stinger - Between 0-15% Health - Cast Fatal Sting (No Repeat)"),
+(5244,0,2,0,2,0,100,1,0,15,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zukk'ash Stinger - Between 0-15% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=5244;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5244,0,0,"%s prepares to sting its victim as a last desperate move!",16,0,100,0,0,0,3713,0,"Zukk'ash Stinger");
+
+-- Krellack
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14476 AND `source_type`=0;
+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
+(14476,0,0,0,2,0,100,0,0,15,8000,12000,11,17170,0,0,0,0,0,2,0,0,0,0,0,0,0,"Krellack - Between 0-15% Health - Cast Fatal Sting");
+
+-- Silvermane Howler
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2925 AND `source_type`=0 AND `id`=2;
+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
+(2925,0,2,0,2,0,100,1,0,50,0,0,39,30,1,0,0,0,0,1,0,0,0,0,0,0,0,"Silvermane Howler - Between 0-50% Health - Call For Help (No Repeat)");
+
+-- Vicious Owlbeast
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2927 AND `source_type`=0;
+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
+(2927,0,0,0,12,0,100,0,0,20,14000,18000,11,7938,0,0,0,0,0,2,0,0,0,0,0,0,0,"Vicious Owlbeast - Target Between 0-20% Health - Cast Fatal Bite");
+
+-- Savage Owlbeast
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2929;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2929 AND `source_type`=0;
+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
+(2929,0,0,0,12,0,100,0,0,20,14000,18000,11,7938,0,0,0,0,0,2,0,0,0,0,0,0,0,"Savage Owlbeast - Target Between 0-20% Health - Cast Fatal Bite");
+
+-- Jalinde Summerdrake
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=8214;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8214 AND `source_type`=0;
+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
+(8214,0,0,0,0,0,100,0,0,0,2300,3900,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Jalinde Summerdrake - In Combat CMC - Cast Shoot"),
+(8214,0,1,0,9,0,100,0,5,30,9000,13000,11,15495,0,0,0,0,0,5,0,0,0,0,0,0,0,"Jalinde Summerdrake - Within 5-30 Range - Cast Explosive Shot"),
+(8214,0,2,0,0,0,100,0,3000,5000,15000,21000,11,8806,32,0,0,0,0,5,0,0,0,0,0,0,0,"Jalinde Summerdrake - In Combat - Cast Poisoned Shot");
+
+-- Highvale Ranger
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2694 AND `source_type`=0 AND `id`=1;
+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
+(2694,0,1,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Highvale Ranger - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Witherbark Zealot
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2650 AND `source_type`=0;
+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
+(2650,0,0,0,2,0,100,1,0,50,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witherbark Zealot - Between 0-50% Health - Cast Enrage (No Repeat)"),
+(2650,0,1,0,2,0,100,1,0,50,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Witherbark Zealot - Between 0-50% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=2650;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(2650,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Witherbark Zealot");
+
+-- Razorbeak Skylord
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2659;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2659 AND `source_type`=0;
+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
+(2659,0,0,0,0,0,100,0,8000,12000,12000,16000,11,11019,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razorbeak Skylord - In Combat - Cast Wing Flap"),
+(2659,0,1,0,9,0,100,0,0,5,15000,19000,11,3147,0,0,0,0,0,2,0,0,0,0,0,0,0,"Razorbeak Skylord - Within 0-5 Range - Cast Rend Flesh");
+
+-- Grimungous
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=8215;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8215 AND `source_type`=0;
+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
+(8215,0,0,0,0,0,100,0,6000,9000,9000,13000,11,5568,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimungous - In Combat - Cast Trample"),
+(8215,0,1,0,9,0,100,0,0,5,14000,20000,11,11876,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimungous - Within 0-5 Range - Cast War Stomp");
+
+-- Shadra
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2707;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2707 AND `source_type`=0;
+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
+(2707,0,0,0,25,0,100,0,0,0,0,0,11,13299,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shadra - On Reset - Cast Poison Proc"),
+(2707,0,1,0,25,0,100,0,0,0,0,0,11,8601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shadra - On Reset - Cast Slowing Poison"),
+(2707,0,2,0,9,0,100,0,0,10,9000,10000,11,28991,0,0,0,0,0,5,0,0,0,0,0,0,0,"Shadra - Within 0-10 Range - Cast Web");
+
+-- Fix bytes2 for some creatures
+UPDATE `creature_template_addon` SET `bytes2`=2 WHERE `entry` IN (2693,2691);
+
+-- Fix wrong spawn for Elder Gray Bear
+UPDATE `creature` SET `position_x`=-598.9, `position_y`=-1604.41, `position_z`=61.6481 WHERE `guid`=14873 AND `id`=2356;
+
+-- Add random movement for some creatures
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid` IN (69119,69117);
+
+-- Pathing for Witherheart the Stalker
+UPDATE `creature` SET `MovementType`=2 WHERE `guid`=85478;
+DELETE FROM `creature_addon` WHERE `guid`=85478;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(85478,854780,0,0,1,0,"");
+
+DELETE FROM `waypoint_data` WHERE `id`=854780;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(854780,1,-336.731,-2833.29,77.0363,0,0,0,0,100,0),
+(854780,2,-334.463,-2814.89,80.383,0,0,0,0,100,0),
+(854780,3,-348.051,-2805.34,80.0625,0,0,0,0,100,0),
+(854780,4,-364.007,-2805.31,76.9893,0,0,0,0,100,0),
+(854780,5,-376.958,-2796.97,77.4724,0,0,0,0,100,0),
+(854780,6,-394.72,-2805.83,77.8546,0,0,0,0,100,0),
+(854780,7,-390.019,-2822.94,74.1284,0,0,0,0,100,0),
+(854780,8,-389.906,-2837.06,74.2824,0,0,0,0,100,0),
+(854780,9,-402.354,-2843.73,76.9459,0,0,0,0,100,0),
+(854780,10,-416.467,-2844.41,79.3868,0,0,0,0,100,0),
+(854780,11,-421.565,-2852.64,79.3284,0,0,0,0,100,0),
+(854780,12,-421.623,-2874.12,83.6468,0,0,0,0,100,0),
+(854780,13,-428.279,-2885.91,84.8522,0,0,0,0,100,0),
+(854780,14,-417.871,-2899.71,83.2011,0,0,0,0,100,0),
+(854780,15,-421.714,-2912.49,82.035,0,0,0,0,100,0),
+(854780,16,-409.008,-2915.46,80.4308,0,0,0,0,100,0),
+(854780,17,-398.058,-2912.56,79.2019,0,0,0,0,100,0),
+(854780,18,-388.929,-2926.26,77.9069,0,0,0,0,100,0),
+(854780,19,-376.519,-2927.69,75.9121,0,0,0,0,100,0),
+(854780,20,-372.09,-2931.3,75.3061,0,0,0,0,100,0),
+(854780,21,-354.46,-2929.29,75.2535,0,0,0,0,100,0),
+(854780,22,-339.972,-2930.95,76.0707,0,0,0,0,100,0),
+(854780,23,-326.085,-2943.36,78.7858,0,0,0,0,100,0),
+(854780,24,-313.89,-2944.59,80.8206,0,0,0,0,100,0),
+(854780,25,-305.916,-2935.44,82.1426,0,0,0,0,100,0),
+(854780,26,-307.534,-2917.76,80.3467,0,0,0,0,100,0),
+(854780,27,-298.165,-2903.94,81.5407,0,0,0,0,100,0),
+(854780,28,-301.296,-2890.28,81.1735,0,0,0,0,100,0),
+(854780,29,-310.921,-2881.96,79.6081,0,0,0,0,100,0),
+(854780,30,-313.692,-2872.43,80.082,0,0,0,0,100,0),
+(854780,31,-312.576,-2859.04,80.4389,0,0,0,0,100,0),
+(854780,32,-320.584,-2852.24,78.3489,0,0,0,0,100,0),
+(854780,33,-336.88,-2851.17,77.2118,0,0,0,0,100,0);
+*/
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_13_world_from_335_was_2018_01_10_05_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_13_world_from_335_was_2018_01_10_05_world.sql
new file mode 100644
index 00000000000..40d965881d9
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_13_world_from_335_was_2018_01_10_05_world.sql
@@ -0,0 +1,49 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-82874,-60777,-60792, -82906, -82903, -52640) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16318) AND `source_type`=0 AND `id`=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
+(16318, 0, 3, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Darkmage - On reset - Cast Ribbon of Souls"),
+(-82906, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Necromancer - On reset - Cast Ribbon of Souls"),
+(-82906, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 11, 9613, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - In Combat CMC - Cast 'Shadow Bolt'"),
+(-82906, 0, 2, 0, 2, 0, 100, 0, 0, 20, 8000, 12000, 11, 29067, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-20% Health - Cast 'Slave Drain'"),
+(-82906, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(-82903, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Necromancer - On reset - Cast Ribbon of Souls"),
+(-82903, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 11, 9613, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - In Combat CMC - Cast 'Shadow Bolt'"),
+(-82903, 0, 2, 0, 2, 0, 100, 0, 0, 20, 8000, 12000, 11, 29067, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-20% Health - Cast 'Slave Drain'"),
+(-82903, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(-82874, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Necromancer - On reset - Cast Ribbon of Souls"),
+(-82874, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 11, 9613, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - In Combat CMC - Cast 'Shadow Bolt'"),
+(-82874, 0, 2, 0, 2, 0, 100, 0, 0, 20, 8000, 12000, 11, 29067, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-20% Health - Cast 'Slave Drain'"),
+(-82874, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(-52640, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Necromancer - On reset - Cast Ribbon of Souls"),
+(-52640, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 11, 9613, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - In Combat CMC - Cast 'Shadow Bolt'"),
+(-52640, 0, 2, 0, 2, 0, 100, 0, 0, 20, 8000, 12000, 11, 29067, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-20% Health - Cast 'Slave Drain'"),
+(-52640, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(-60777, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Necromancer - On reset - Cast Ribbon of Souls"),
+(-60777, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 11, 9613, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - In Combat CMC - Cast 'Shadow Bolt'"),
+(-60777, 0, 2, 0, 2, 0, 100, 0, 0, 20, 8000, 12000, 11, 29067, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-20% Health - Cast 'Slave Drain'"),
+(-60777, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(-60792, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 28729, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,"Deatholme Necromancer - On reset - Cast Ribbon of Souls"),
+(-60792, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 11, 9613, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - In Combat CMC - Cast 'Shadow Bolt'"),
+(-60792, 0, 2, 0, 2, 0, 100, 0, 0, 20, 8000, 12000, 11, 29067, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-20% Health - Cast 'Slave Drain'"),
+(-60792, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Deatholme Necromancer - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (28731);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,28731,0,0, 31,0,3,10415,0,0,0,'','Ribbon of Souls');
+
+UPDATE `creature` SET `position_x`=6317.244141, `position_y`=-6241.477051 WHERE `guid`=60792 AND `id`=16317;
+UPDATE `creature` SET `position_x`=6302.362793, `position_y`=-6241.597168 WHERE `guid`=60777 AND `id`=16317;
+UPDATE `creature` SET `position_x`=6302.773438, `position_y`=-6255.696289 WHERE `guid`=52640 AND `id`=16317;
+UPDATE `creature` SET `position_x`=6311.409668, `position_y`=-6472.390625 WHERE `guid`=82906 AND `id`=16317;
+UPDATE `creature` SET `position_x`=6297.720703, `position_y`=-6471.333008 WHERE `guid`=82903 AND `id`=16317;
+UPDATE `creature` SET `position_x`=6298.272949, `position_y`=-6457.236328 WHERE `guid`=82874 AND `id`=16317;
+UPDATE `creature` SET `position_x`=7220.31, `position_y`=-6406.11, `position_z`=56.1661, `orientation`=4.77281, spawndist=0, MovementType=0 WHERE `guid`=82656 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7216.75, `position_y`=-6415.47, `position_z`=59.2486, `orientation`=0.10472, spawndist=0, MovementType=0 WHERE `guid`=82657 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7229.53, `position_y`=-6415.04, `position_z`=56.1660, `orientation`=3.16177, spawndist=0, MovementType=0 WHERE `guid`=82658 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7220.87, `position_y`=-6424.45, `position_z`=56.1659, `orientation`=1.64359, spawndist=0, MovementType=0 WHERE `guid`=82665 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7161.33, `position_y`=-6612.54, `position_z`=60.6584, `orientation`=6.04004, spawndist=0, MovementType=0 WHERE `guid`=82741 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7171.98, `position_y`=-6606.72, `position_z`=60.6584, `orientation`=4.43751, spawndist=0, MovementType=0 WHERE `guid`=82742 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7173.00, `position_y`=-6615.81, `position_z`=63.7428, `orientation`=2.95281, spawndist=0, MovementType=0 WHERE `guid`=82743 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7167.75, `position_y`=-6623.78, `position_z`=60.6587, `orientation`=1.37635, spawndist=0, MovementType=0 WHERE `guid`=82770 AND `id`=16318;
+UPDATE `creature` SET `position_x`=7207.989258, `position_y`=-6662.287109, `position_z`=48.618168 WHERE `guid`=82767;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_14_world_from_335_was_2018_01_12_00_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_14_world_from_335_was_2018_01_12_00_world.sql
new file mode 100644
index 00000000000..2edfa940762
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_14_world_from_335_was_2018_01_12_00_world.sql
@@ -0,0 +1,381 @@
+SET @GUID := 84493;
+SET @POOL := 383;
+
+-- Update existing spawns
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (82665, 82656);
+UPDATE `creature` SET `spawndist`=0, `MovementType`=2 WHERE `guid` IN (82863, 82918, 82866, 82817, 82890, 82878);
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid` IN (82824, 82820, 82926, 82860, 82930, 82857, 82911, 82885, 82858, 82828);
+UPDATE `creature` SET `orientation`=4.7037 WHERE `guid`=82656;
+UPDATE `creature` SET `position_x`=6313.952, `position_y`=-6456.592, `position_z`=86.010, `orientation`=0.7696 WHERE `guid`=82866;
+UPDATE `creature` SET `position_x`=6465.840, `position_y`=-6433.699, `position_z`=50.330, `orientation`=1.7237 WHERE `guid`=39681;
+UPDATE `creature` SET `position_x`=6632.847, `position_y`=-6334.324, `position_z`=29.980, `orientation`=3.1317 WHERE `guid`=82821;
+UPDATE `creature` SET `position_x`=6634.258, `position_y`=-6321.420, `position_z`=29.694, `orientation`=3.0571 WHERE `guid`=82872;
+UPDATE `creature` SET `position_x`=6648.481, `position_y`=-6379.550, `position_z`=32.274, `orientation`=3.4340 WHERE `guid`=82851;
+UPDATE `creature` SET `position_x`=6645.707, `position_y`=-6293.447, `position_z`=29.268, `orientation`=3.1262 WHERE `guid`=82914;
+UPDATE `creature` SET `position_x`=6427.863, `position_y`=-6653.198, `position_z`=108.56, `orientation`=1.0551 WHERE `guid`=82858;
+UPDATE `creature` SET `position_x`=6611.074, `position_y`=-6442.624, `position_z`=29.296, `orientation`=1.5043 WHERE `guid`=82817;
+UPDATE `creature` SET `position_x`=6454.949, `position_y`=-6647.249, `position_z`=108.56, `orientation`=2.6108 WHERE `guid`=82857;
+UPDATE `creature` SET `position_x`=6521.936, `position_y`=-6349.830, `position_z`=44.203, `orientation`=3.7672 WHERE `guid`=82923;
+UPDATE `creature` SET `position_x`=6420.697, `position_y`=-6293.954, `position_z`=61.144, `orientation`=3.4361 WHERE `guid`=82868;
+UPDATE `creature` SET `position_x`=6296.796, `position_y`=-6303.080, `position_z`=79.898, `orientation`=4.7771 WHERE `guid`=82867;
+UPDATE `creature` SET `position_x`=6267.040, `position_y`=-6292.856, `position_z`=80.604, `orientation`=0.5556 WHERE `guid`=82910;
+UPDATE `creature` SET `position_x`=6272.511, `position_y`=-6257.678, `position_z`=80.570, `orientation`=1.4195 WHERE `guid`=82852;
+UPDATE `creature` SET `position_x`=6307.016, `position_y`=-6213.658, `position_z`=80.417, `orientation`=6.1398 WHERE `guid`=82850;
+UPDATE `creature` SET `position_x`=6360.072, `position_y`=-6227.810, `position_z`=72.586, `orientation`=2.1303 WHERE `guid`=82909;
+UPDATE `creature` SET `position_x`=6398.821, `position_y`=-6243.595, `position_z`=68.761, `orientation`=2.2183 WHERE `guid`=82900;
+UPDATE `creature` SET `position_x`=6395.926, `position_y`=-6213.756, `position_z`=71.929, `orientation`=2.2285 WHERE `guid`=82887;
+UPDATE `creature` SET `position_x`=6422.431, `position_y`=-6229.785, `position_z`=66.734, `orientation`=1.9065 WHERE `guid`=82888;
+UPDATE `creature` SET `position_x`=6629.632, `position_y`=-6246.243, `position_z`=36.022, `orientation`=3.6383 WHERE `guid`=82892;
+UPDATE `creature` SET `position_x`=6554.866, `position_y`=-6290.081, `position_z`=44.863, `orientation`=1.1604 WHERE `guid`=82884;
+UPDATE `creature` SET `position_x`=6608.253, `position_y`=-6260.457, `position_z`=39.272, `orientation`=3.8926 WHERE `guid`=82926;
+UPDATE `creature` SET `position_x`=6526.996, `position_y`=-6298.201, `position_z`=46.122, `orientation`=1.4706 WHERE `guid`=82860;
+UPDATE `creature` SET `position_x`=6580.820, `position_y`=-6316.210, `position_z`=35.502, `orientation`=6.1693 WHERE `guid`=82930;
+UPDATE `creature` SET `position_x`=6509.947, `position_y`=-6259.630, `position_z`=52.218, `orientation`=2.8620 WHERE `guid`=82890;
+UPDATE `creature` SET `position_x`=6509.947, `position_y`=-6259.630, `position_z`=52.218, `orientation`=2.8620 WHERE `guid`=82878;
+
+-- Add 7 Deatholme Necromancers, 4 Nerubis Centurions and one Wailer
+-- Delete unnecessary spawns
+DELETE FROM `creature` WHERE `guid` IN (82827, 82822, 82826, 82919, 82841, 82916, 82864, 82932, @GUID, @GUID + 1, @GUID + 2, @GUID + 3);
+DELETE FROM `creature_addon` WHERE `guid` IN (82841, 82916);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(@GUID , 16317, 530, 0, 0, 1, 1, 0, 1, 6639.734, -6308.425, 29.309, 3.5275, 300, 5, 0, 377, 408, 1, 0, 0, 0, '', 0),
+(@GUID + 1, 16317, 530, 0, 0, 0, 0, 1, 1, 6300.696, -6240.295, 77.814, 5.5458, 300, 0, 0, 377, 408, 0, 0, 0, 0, '', 0),
+(@GUID + 2, 16317, 530, 0, 0, 0, 0, 1, 1, 6318.298, -6239.599, 77.814, 3.9632, 300, 0, 0, 377, 408, 0, 0, 0, 0, '', 0),
+(@GUID + 3, 16321, 530, 0, 0, 0, 0, 0, 0, 6313.952, -6456.592, 86.010, 0.7696, 300, 0, 0, 417, 0, 2, 0, 0, 0, '', 0),
+(82827, 16317, 530, 0, 0, 0, 0, 1, 1, 6301.783, -6257.833, 77.814, 0.8059, 300, 0, 0, 377, 408, 0, 0, 0, 0, '', 0),
+(82822, 16317, 530, 0, 0, 1, 1, 0, 1, 6487.521, -6220.514, 52.843, 5.2114, 300, 3, 0, 377, 408, 1, 0, 0, 0, '', 0),
+(82826, 16317, 530, 0, 0, 1, 1, 0, 1, 6503.702, -6231.611, 53.441, 4.9601, 300, 3, 0, 377, 408, 1, 0, 0, 0, '', 0),
+(82919, 16317, 530, 0, 0, 1, 1, 0, 1, 6479.111, -6289.687, 48.879, 3.1081, 300, 0, 0, 377, 408, 0, 0, 0, 0, '', 0),
+(82841, 16319, 530, 0, 0, 1, 1, 0, 0, 6455.776, -6221.851, 63.585, 4.6828, 300, 5, 0, 417, 0, 1, 0, 0, 0, '', 0),
+(82916, 16319, 530, 0, 0, 1, 1, 0, 0, 6553.187, -6229.246, 54.462, 4.8863, 300, 5, 0, 417, 0, 1, 0, 0, 0, '', 0),
+(82864, 16319, 530, 0, 0, 1, 1, 0, 0, 6587.955, -6204.042, 52.907, 4.1519, 300, 5, 0, 417, 0, 1, 0, 0, 0, '', 0),
+(82932, 16319, 530, 0, 0, 1, 1, 0, 0, 6591.726, -6242.592, 45.860, 4.5061, 300, 5, 0, 417, 0, 1, 0, 0, 0, '', 0);
+
+-- Add pool to either spawn Eye of Dar'Khan or Wailer
+DELETE FROM `pool_template` WHERE `entry`IN (@POOL, @POOL + 1);
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(@POOL, 1, "Eye of Dar'Khan/Wailer 3"),
+(@POOL + 1, 1, "Eye of Dar'Khan/Wailer 4");
+
+DELETE FROM `pool_creature` WHERE `guid` IN (82890, 82878, 82866, @GUID + 3);
+INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(82890, @POOL, 0, "Wailer Spawn 3"),
+(82878, @POOL, 0, "Eye of Dar'Khan Spawn 3"),
+(82866, @POOL + 1, 0, "Eye of Dar'Khan Spawn 4"),
+(@GUID + 3, @POOL + 1, 0, "Wailer Spawn 4");
+
+-- Add waypoints
+SET @PATHID_1 := 828170;
+SET @PATHID_2 := 828630;
+SET @PATHID_3 := 828660;
+SET @PATHID_4 := 828780;
+SET @PATHID_5 := 828900;
+SET @PATHID_6 := 829180;
+SET @PATHID_7 := (@GUID + 3) * 10;
+
+DELETE FROM `creature_addon` WHERE `guid` IN (82817, 82863, 82866, 82878, 82890, 82918, 82919, @GUID + 3);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(82817, @PATHID_1, 0, 0, 4097, 0, ''),
+(82863, @PATHID_2, 0, 0, 4097, 0, ''),
+(82866, @PATHID_3, 0, 0, 4097, 0, ''),
+(82878, @PATHID_4, 0, 0, 4097, 0, ''),
+(82890, @PATHID_5, 0, 0, 4097, 0, ''),
+(82918, @PATHID_6, 0, 0, 4097, 0, ''),
+(@GUID + 3, @PATHID_7, 0, 0, 4097, 0, ''),
+(82919, 0, 0, 8, 4097, 0, '');
+
+DELETE FROM `waypoint_data` WHERE `id` IN (@PATHID_1, @PATHID_2, @PATHID_3, @PATHID_4, @PATHID_5, @PATHID_6, @PATHID_7);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@PATHID_1, 1 , 6611.96, -6425.78, 29.015, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 2 , 6612.37, -6403.64, 29.795, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 3 , 6612.751, -6373.300, 31.285, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 4 , 6607.327, -6340.160, 32.998, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 5 , 6633.636, -6327.645, 29.859, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 6 , 6662.058, -6331.109, 20.892, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 7 , 6660.822, -6345.714, 15.346, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 8 , 6642.960, -6344.136, 8.9457, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 9 , 6660.822, -6345.714, 15.346, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 10, 6662.058, -6331.109, 20.892, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 11, 6633.636, -6327.645, 29.859, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 12, 6607.327, -6340.160, 32.998, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 13, 6612.751, -6373.300, 31.285, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 14, 6612.133, -6403.323, 29.817, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 15, 6611.742, -6424.312, 29.100, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 16, 6611.074, -6442.624, 29.296, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 17, 6638.616, -6450.047, 29.260, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 18, 6682.422, -6468.475, 29.258, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 19, 6638.616, -6450.047, 29.260, 0, 0, 0, 0, 100, 0),
+(@PATHID_1, 20, 6611.074, -6442.624, 29.296, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 1 , 6377.080, -6418.936, 69.218, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 2 , 6398.718, -6453.004, 65.142, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 3 , 6427.659, -6481.115, 58.952, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 4 , 6421.906, -6506.947, 64.563, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 5 , 6401.373, -6516.191, 72.359, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 6 , 6414.936, -6552.770, 89.385, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 7 , 6429.261, -6587.137, 106.91, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 8 , 6433.487, -6608.261, 112.12, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 9 , 6440.302, -6609.170, 111.31, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 10, 6443.041, -6612.974, 109.86, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 11, 6440.646, -6616.693, 108.16, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 12, 6435.418, -6617.644, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 13, 6437.832, -6631.190, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 14, 6443.814, -6630.771, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 15, 6445.875, -6637.555, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 16, 6433.196, -6640.240, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 17, 6431.258, -6632.428, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 18, 6437.832, -6631.190, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 19, 6435.418, -6617.644, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 20, 6429.785, -6618.460, 108.16, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 21, 6426.261, -6614.584, 110.20, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 22, 6428.508, -6610.895, 111.86, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 23, 6433.487, -6608.261, 112.12, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 24, 6429.261, -6587.137, 106.91, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 25, 6414.936, -6552.770, 89.385, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 26, 6401.373, -6516.191, 72.359, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 27, 6421.906, -6506.947, 64.563, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 28, 6427.659, -6481.115, 58.952, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 29, 6398.718, -6453.004, 65.142, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 30, 6377.080, -6418.936, 69.218, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 31, 6363.169, -6422.522, 72.021, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 32, 6352.583, -6418.915, 74.820, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 33, 6343.597, -6402.317, 76.704, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 34, 6341.153, -6368.378, 78.169, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 35, 6314.771, -6365.563, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 36, 6312.752, -6371.422, 82.168, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 37, 6308.715, -6372.937, 80.597, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 38, 6305.466, -6369.537, 78.590, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 39, 6305.905, -6364.626, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 40, 6292.153, -6362.942, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 41, 6291.132, -6369.037, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 42, 6283.469, -6368.633, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 43, 6284.680, -6356.278, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 44, 6292.802, -6356.765, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 45, 6292.153, -6362.942, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 46, 6305.905, -6364.626, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 47, 6306.756, -6359.130, 78.733, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 48, 6309.865, -6356.616, 80.466, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 49, 6314.133, -6359.876, 82.436, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 50, 6314.771, -6365.563, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 51, 6341.153, -6368.378, 78.169, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 52, 6333.770, -6348.563, 76.818, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 53, 6333.767, -6327.803, 74.552, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 54, 6338.590, -6314.027, 74.010, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 55, 6357.218, -6299.626, 70.514, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 56, 6375.088, -6303.510, 67.412, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 57, 6372.027, -6331.164, 67.791, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 58, 6372.056, -6370.585, 68.288, 0, 0, 0, 0, 100, 0),
+(@PATHID_2, 59, 6373.919, -6399.319, 68.697, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 1 , 6330.639, -6441.106, 86.010, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 2 , 6352.536, -6421.323, 74.822, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 3 , 6343.770, -6402.389, 76.696, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 4 , 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 5 , 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 6 , 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 7 , 6314.150, -6359.148, 82.244, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 8 , 6311.043, -6356.015, 80.682, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 9 , 6306.164, -6359.391, 78.562, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 10, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 11, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 12, 6292.496, -6356.788, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 13, 6285.575, -6355.713, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 14, 6283.279, -6367.917, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 15, 6290.895, -6368.846, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 16, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 17, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 18, 6305.421, -6370.855, 79.300, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 19, 6309.991, -6373.575, 80.873, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 20, 6313.490, -6370.015, 82.593, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 21, 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 22, 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 23, 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 24, 6334.457, -6350.810, 77.142, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 25, 6334.189, -6326.300, 74.539, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 26, 6342.840, -6311.019, 73.289, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 27, 6358.172, -6298.210, 70.389, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 28, 6347.737, -6282.332, 73.269, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 29, 6332.741, -6269.205, 80.814, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 30, 6316.709, -6254.649, 80.813, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 31, 6332.741, -6269.205, 80.814, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 32, 6347.737, -6282.332, 73.269, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 33, 6358.172, -6298.210, 70.389, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 34, 6342.840, -6311.019, 73.289, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 35, 6334.189, -6326.300, 74.539, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 36, 6334.457, -6350.810, 77.142, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 37, 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 38, 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 39, 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 40, 6313.490, -6370.015, 82.593, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 41, 6309.991, -6373.575, 80.873, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 42, 6305.421, -6370.855, 79.300, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 43, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 44, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 45, 6290.895, -6368.846, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 46, 6283.279, -6367.917, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 47, 6285.575, -6355.713, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 48, 6292.496, -6356.788, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 49, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 50, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 51, 6306.164, -6359.391, 78.562, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 52, 6311.043, -6356.015, 80.682, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 53, 6314.150, -6359.148, 82.244, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 54, 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 55, 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 56, 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 57, 6343.770, -6402.389, 76.696, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 58, 6352.536, -6421.323, 74.822, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 59, 6330.639, -6441.106, 86.010, 0, 0, 0, 0, 100, 0),
+(@PATHID_3, 60, 6313.952, -6456.592, 86.010, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 1 , 6488.539, -6253.512, 54.803, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 2 , 6454.999, -6247.834, 59.668, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 3 , 6428.734, -6251.192, 62.728, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 4 , 6407.557, -6264.989, 64.431, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 5 , 6377.234, -6302.075, 67.330, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 6 , 6371.789, -6333.094, 67.813, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 7 , 6372.280, -6373.574, 68.195, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 8 , 6375.288, -6416.049, 69.208, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 9 , 6397.393, -6451.178, 65.380, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 10, 6420.690, -6474.398, 60.630, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 11, 6438.690, -6482.448, 56.147, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 12, 6457.238, -6482.606, 52.163, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 13, 6492.921, -6473.459, 46.546, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 14, 6532.628, -6472.347, 40.189, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 15, 6552.782, -6479.319, 36.314, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 16, 6567.054, -6476.944, 34.800, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 17, 6584.220, -6464.868, 31.281, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 18, 6611.095, -6446.294, 29.289, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 19, 6612.964, -6415.944, 29.393, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 20, 6612.262, -6369.374, 31.552, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 21, 6607.229, -6339.476, 33.038, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 22, 6607.060, -6307.095, 35.684, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 23, 6600.841, -6288.766, 38.173, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 24, 6577.676, -6266.068, 43.243, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 25, 6556.293, -6256.180, 47.430, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 26, 6531.748, -6256.037, 50.964, 0, 0, 0, 0, 100, 0),
+(@PATHID_4, 27, 6509.947, -6259.630, 52.218, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 1 , 6488.539, -6253.512, 54.803, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 2 , 6454.999, -6247.834, 59.668, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 3 , 6428.734, -6251.192, 62.728, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 4 , 6407.557, -6264.989, 64.431, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 5 , 6377.234, -6302.075, 67.330, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 6 , 6371.789, -6333.094, 67.813, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 7 , 6372.280, -6373.574, 68.195, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 8 , 6375.288, -6416.049, 69.208, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 9 , 6397.393, -6451.178, 65.380, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 10, 6420.690, -6474.398, 60.630, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 11, 6438.690, -6482.448, 56.147, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 12, 6457.238, -6482.606, 52.163, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 13, 6492.921, -6473.459, 46.546, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 14, 6532.628, -6472.347, 40.189, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 15, 6552.782, -6479.319, 36.314, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 16, 6567.054, -6476.944, 34.800, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 17, 6584.220, -6464.868, 31.281, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 18, 6611.095, -6446.294, 29.289, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 19, 6612.964, -6415.944, 29.393, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 20, 6612.262, -6369.374, 31.552, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 21, 6607.229, -6339.476, 33.038, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 22, 6607.060, -6307.095, 35.684, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 23, 6600.841, -6288.766, 38.173, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 24, 6577.676, -6266.068, 43.243, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 25, 6556.293, -6256.180, 47.430, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 26, 6531.748, -6256.037, 50.964, 0, 0, 0, 0, 100, 0),
+(@PATHID_5, 27, 6509.947, -6259.630, 52.218, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 1 , 6419.647, -6507.635, 65.668, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 2 , 6404.997, -6527.250, 76.185, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 3 , 6417.598, -6554.907, 90.450, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 4 , 6429.581, -6587.663, 107.14, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 5 , 6433.624, -6609.415, 112.12, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 6 , 6428.771, -6610.919, 111.92, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 7 , 6425.644, -6614.498, 110.22, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 8 , 6430.408, -6618.958, 107.91, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 9 , 6435.195, -6617.991, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 10, 6437.642, -6631.544, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 11, 6431.639, -6632.799, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 12, 6432.430, -6640.100, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 13, 6445.388, -6638.985, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 14, 6444.346, -6630.780, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 15, 6437.681, -6631.792, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 16, 6435.195, -6617.991, 107.43, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 17, 6441.831, -6615.938, 108.81, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 18, 6442.822, -6611.981, 110.09, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 19, 6438.264, -6608.972, 112.03, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 20, 6433.624, -6609.415, 112.12, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 21, 6429.581, -6587.663, 107.14, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 22, 6417.598, -6554.907, 90.450, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 23, 6404.997, -6527.250, 76.185, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 24, 6419.647, -6507.635, 65.668, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 25, 6439.412, -6483.352, 55.986, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 26, 6456.798, -6482.650, 52.260, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 27, 6471.180, -6480.312, 49.019, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 28, 6474.134, -6507.354, 43.687, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 29, 6491.953, -6512.302, 43.764, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 30, 6489.284, -6527.174, 43.762, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 31, 6511.797, -6547.596, 43.762, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 32, 6540.833, -6538.003, 43.763, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 33, 6547.380, -6508.357, 43.763, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 34, 6524.278, -6487.136, 43.762, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 35, 6495.589, -6496.744, 43.762, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 36, 6491.953, -6512.302, 43.764, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 37, 6474.134, -6507.354, 43.687, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 38, 6471.180, -6480.312, 49.019, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 39, 6456.798, -6482.650, 52.260, 0, 0, 0, 0, 100, 0),
+(@PATHID_6, 40, 6439.412, -6483.352, 55.986, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 1 , 6330.639, -6441.106, 86.010, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 2 , 6352.536, -6421.323, 74.822, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 3 , 6343.770, -6402.389, 76.696, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 4 , 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 5 , 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 6 , 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 7 , 6314.150, -6359.148, 82.244, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 8 , 6311.043, -6356.015, 80.682, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 9 , 6306.164, -6359.391, 78.562, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 10, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 11, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 12, 6292.496, -6356.788, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 13, 6285.575, -6355.713, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 14, 6283.279, -6367.917, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 15, 6290.895, -6368.846, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 16, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 17, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 18, 6305.421, -6370.855, 79.300, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 19, 6309.991, -6373.575, 80.873, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 20, 6313.490, -6370.015, 82.593, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 21, 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 22, 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 23, 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 24, 6334.457, -6350.810, 77.142, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 25, 6334.189, -6326.300, 74.539, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 26, 6342.840, -6311.019, 73.289, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 27, 6358.172, -6298.210, 70.389, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 28, 6347.737, -6282.332, 73.269, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 29, 6332.741, -6269.205, 80.814, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 30, 6316.709, -6254.649, 80.813, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 31, 6332.741, -6269.205, 80.814, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 32, 6347.737, -6282.332, 73.269, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 33, 6358.172, -6298.210, 70.389, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 34, 6342.840, -6311.019, 73.289, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 35, 6334.189, -6326.300, 74.539, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 36, 6334.457, -6350.810, 77.142, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 37, 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 38, 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 39, 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 40, 6313.490, -6370.015, 82.593, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 41, 6309.991, -6373.575, 80.873, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 42, 6305.421, -6370.855, 79.300, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 43, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 44, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 45, 6290.895, -6368.846, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 46, 6283.279, -6367.917, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 47, 6285.575, -6355.713, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 48, 6292.496, -6356.788, 78.018, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 49, 6291.851, -6362.960, 78.020, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 50, 6305.445, -6364.378, 78.025, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 51, 6306.164, -6359.391, 78.562, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 52, 6311.043, -6356.015, 80.682, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 53, 6314.150, -6359.148, 82.244, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 54, 6313.788, -6365.322, 82.710, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 55, 6324.463, -6366.408, 82.699, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 56, 6341.206, -6368.728, 78.164, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 57, 6343.770, -6402.389, 76.696, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 58, 6352.536, -6421.323, 74.822, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 59, 6330.639, -6441.106, 86.010, 0, 0, 0, 0, 100, 0),
+(@PATHID_7, 60, 6313.952, -6456.592, 86.010, 0, 0, 0, 0, 100, 0);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_15_world_from_335_was_2018_01_12_01_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_15_world_from_335_was_2018_01_12_01_world.sql
new file mode 100644
index 00000000000..4914d1d2871
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_15_world_from_335_was_2018_01_12_01_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `modelid`=0, `phaseMask`=1, `spawnMask`=1 WHERE `guid` IN (84494,84495,84496,82827);
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_16_world_from_335_was_2018_01_12_02_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_16_world_from_335_was_2018_01_12_02_world.sql
new file mode 100644
index 00000000000..60aa81a5c67
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_16_world_from_335_was_2018_01_12_02_world.sql
@@ -0,0 +1,338 @@
+UPDATE `creature_template` SET `ScriptName`='npc_watch_commander_leonus' WHERE `entry`=19392;
+UPDATE `creature_template` SET `ScriptName`='npc_fear_controller' WHERE `entry`=19393;
+UPDATE `creature_template` SET `InhabitType`=4, `unit_flags`=33554688, `unit_flags2`=2099200, `mechanic_immune_mask`=16, `ScriptName`='npc_infernal_rain_hellfire' WHERE `entry`=18729;
+
+SET @CGUID:=86515;
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+14;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES
+(@CGUID+0 , 18729, 530, 1, 1, 0, 0, -683.1428, 2622.864, 89.59037, 5.80891, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+1 , 18729, 530, 1, 1, 0, 0, -713.3168, 2651.34, 93.92698, 5.471165, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+2 , 18729, 530, 1, 1, 0, 0, -741.99, 2684.844, 102.0951, 4.382171, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+3 , 18729, 530, 1, 1, 0, 0, -693.7301, 2633.678, 90.98701, 0.2279181, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+4 , 18729, 530, 1, 1, 0, 0, -735.713, 2694.272, 104.4392, 0.5298103, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+5 , 18729, 530, 1, 1, 0, 0, -681.5517, 2599.244, 87.77497, 0.3001323, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+6 , 18729, 530, 1, 1, 0, 0, -642.3084, 2637.57, 86.72314, 0.4260551, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+7 , 18729, 530, 1, 1, 0, 0, -659.7936, 2608.224, 86.08431, 2.401085, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+8 , 18729, 530, 1, 1, 0, 0, -623.8005, 2710.563, 87.20694, 0.7798759, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+9 , 18729, 530, 1, 1, 0, 0, -641.7952, 2562.457, 80.51072, 4.093502, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+10, 18729, 530, 1, 1, 0, 0, -691.3125, 2778.354, 146.9783, 0.1396263, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+11, 18729, 530, 1, 1, 0, 0, -722.2483, 2568.132, 143.0607, 1.291544, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+12, 18729, 530, 1, 1, 0, 0, -649.1522, 2588.543, 125.6584, 6.195919, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+13, 18729, 530, 1, 1, 0, 0, -774.342, 2746.167, 185.9423, 4.572762, 120, 0, 0, 0, 0, 0, 0, 0, 0), -- 18729 (Area: 3538)
+(@CGUID+14, 18729, 530, 1, 1, 0, 0, -588.2762, 2632.034, 146.1269, 4.29351, 120, 0, 0, 0, 0, 0, 0, 0, 0); -- 18729 (Area: 3538)
+
+-- Pathing for INFERNAL RAIN (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+0;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-698.8525,`position_y`=2632.825,`position_z`=91.81726 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-698.8525,2632.825,91.81726,0,0,0,0,100,0), -- 15:21:08
+(@PATH,2,-677.9506,2644.509,90.49536,0,0,0,0,100,0), -- 15:21:10
+(@PATH,3,-676.4061,2653.433,90.78812,0,0,0,0,100,0), -- 15:21:18
+(@PATH,4,-681.5089,2671.245,91.57988,0,0,0,0,100,0), -- 15:21:11
+(@PATH,5,-687.4851,2676.51,93.05498,0,0,0,0,100,0), -- 15:21:27
+(@PATH,6,-698.7255,2680.534,94.95392,0,0,0,0,100,0), -- 15:21:12
+(@PATH,7,-719.0013,2673.964,96.20638,0,0,0,0,100,0), -- 15:21:13
+(@PATH,8,-724.5556,2664.502,95.43507,0,0,0,0,100,0), -- 15:21:22
+(@PATH,9,-724.8938,2656.548,95.15915,0,0,0,0,100,0), -- 15:21:14
+(@PATH,10,-717.3865,2639.541,93.57843,0,0,0,0,100,0), -- 15:21:23
+(@PATH,11,-708.137,2634.875,92.46405,0,0,0,0,100,0); -- 15:21:16
+-- 0x203CC84240124A400000440000351C35 .go -698.8525 2632.825 91.81726
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+1;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-656.7727,`position_y`=2602.906,`position_z`=85.797 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-656.7727,2602.906,85.797,0,0,0,0,100,0), -- 15:22:43
+(@PATH,2,-678.8431,2618.197,88.64764,0,0,0,0,100,0), -- 15:22:44
+(@PATH,3,-675.5577,2630.384,88.95792,0,0,0,0,100,0), -- 15:22:46
+(@PATH,4,-656.4027,2644.927,87.55663,0,0,0,0,100,0), -- 15:22:47
+(@PATH,5,-648.3109,2634.846,86.95815,0,0,0,0,100,0), -- 15:22:48
+(@PATH,6,-647.9454,2635.122,87.21871,0,0,0,0,100,0), -- 15:22:49
+(@PATH,7,-636.1139,2640.37,86.79756,0,0,0,0,100,0), -- 15:22:49
+(@PATH,8,-626.1254,2626.464,85.096,0,0,0,0,100,0), -- 15:22:50
+(@PATH,9,-647.9573,2611.305,86.06158,0,0,0,0,100,0); -- 15:22:52
+-- 0x203CC84240124A400000440000B51C35 .go -656.7727 2602.906 85.797
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+2;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-613.5233,`position_y`=2568.954,`position_z`=81.81258 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-613.5233,2568.954,81.81258,0,0,0,0,100,0), -- 15:21:22
+(@PATH,2,-629.8984,2569.196,81.15677,0,0,0,0,100,0), -- 15:21:23
+(@PATH,3,-654.4181,2550.052,78.73563,0,0,0,0,100,0), -- 15:21:24
+(@PATH,4,-658.7616,2530.438,73.62208,0,0,0,0,100,0), -- 15:21:27
+(@PATH,5,-636.1871,2545.187,77.4874,0,0,0,0,100,0), -- 15:21:28
+(@PATH,6,-631.4529,2548.692,77.04776,0,0,0,0,100,0), -- 15:21:29
+(@PATH,7,-584.7521,2568.345,76.42328,0,0,0,0,100,0), -- 15:21:30
+(@PATH,8,-586.6555,2596.958,88.95888,0,0,0,0,100,0), -- 15:21:33
+(@PATH,9,-591.6433,2598.593,87.90211,0,0,0,0,100,0), -- 15:21:34
+(@PATH,10,-600.2521,2585.858,82.3437,0,0,0,0,100,0), -- 15:21:35
+(@PATH,11,-613.5173,2569.089,81.87325,0,0,0,0,100,0), -- 15:21:36
+(@PATH,12,-643.5018,2559.942,80.45127,0,0,0,0,100,0), -- 15:21:38
+(@PATH,13,-654.5405,2550.142,78.79336,0,0,0,0,100,0), -- 15:21:39
+(@PATH,14,-669.284,2539.369,74.70662,0,0,0,0,100,0), -- 15:21:40
+(@PATH,15,-658.7957,2530.59,73.66014,0,0,0,0,100,0), -- 15:21:41
+(@PATH,16,-636.2113,2545.337,77.37846,0,0,0,0,100,0), -- 15:21:42
+(@PATH,17,-631.4822,2548.737,76.93141,0,0,0,0,100,0), -- 15:21:44
+(@PATH,18,-584.7199,2568.445,76.33899,0,0,0,0,100,0), -- 15:21:45
+(@PATH,19,-582.5537,2571.944,76.96735,0,0,0,0,100,0), -- 15:21:46
+(@PATH,20,-586.6714,2596.896,88.93387,0,0,0,0,100,0), -- 15:21:47
+(@PATH,21,-600.2708,2585.577,82.16212,0,0,0,0,100,0), -- 15:21:48
+(@PATH,22,-613.3537,2569.01,81.93314,0,0,0,0,100,0), -- 15:21:50
+(@PATH,23,-615.0601,2567.808,81.13249,0,0,0,0,100,0), -- 15:21:51
+(@PATH,24,-643.3428,2559.926,80.59372,0,0,0,0,100,0), -- 15:21:52
+(@PATH,25,-654.5143,2549.978,78.61452,0,0,0,0,100,0), -- 15:21:53
+(@PATH,26,-669.2421,2538.915,74.92723,0,0,0,0,100,0), -- 15:21:55
+(@PATH,27,-658.9216,2530.562,73.78191,0,0,0,0,100,0), -- 15:21:56
+(@PATH,28,-636.2302,2545.251,77.44119,0,0,0,0,100,0), -- 15:21:57
+(@PATH,29,-631.1454,2548.875,76.91211,0,0,0,0,100,0), -- 15:21:58
+(@PATH,30,-584.6096,2568.467,76.48515,0,0,0,0,100,0), -- 15:21:59
+(@PATH,31,-582.5697,2571.928,76.96999,0,0,0,0,100,0), -- 15:22:01
+(@PATH,32,-591.4938,2598.523,88.00578,0,0,0,0,100,0), -- 15:22:02
+(@PATH,33,-600.2296,2585.605,82.09475,0,0,0,0,100,0), -- 15:22:03
+(@PATH,34,-613.3531,2569.051,81.79434,0,0,0,0,100,0); -- 15:22:04
+-- 0x203CC84240124A400000440001B51C35 .go -613.5233 2568.954 81.81258
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+3;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-620.3628,`position_y`=2564.344,`position_z`=79.32322 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-620.3628,2564.344,79.32322,0,0,0,0,100,0), -- 15:21:33
+(@PATH,2,-634.0519,2571.64,81.53027,0,0,0,0,100,0), -- 15:21:34
+(@PATH,3,-649.1782,2594.351,84.73848,0,0,0,0,100,0), -- 15:21:35
+(@PATH,4,-664.6262,2612.697,86.85725,0,0,0,0,100,0), -- 15:21:36
+(@PATH,5,-665.9905,2624.81,87.50397,0,0,0,0,100,0), -- 15:21:38
+(@PATH,6,-674.386,2625.81,88.74261,0,0,0,0,100,0), -- 15:21:39
+(@PATH,7,-660.9735,2608.719,86.27945,0,0,0,0,100,0), -- 15:21:40
+(@PATH,8,-645.7166,2575.045,83.09628,0,0,0,0,100,0), -- 15:21:41
+(@PATH,9,-632.8522,2543.363,77.10129,0,0,0,0,100,0), -- 15:21:42
+(@PATH,10,-610.8413,2554.551,75.4816,0,0,0,0,100,0), -- 15:21:44
+(@PATH,11,-600.859,2562.016,78.13591,0,0,0,0,100,0), -- 15:21:45
+(@PATH,12,-596.7775,2586.915,82.92734,0,0,0,0,100,0), -- 15:21:46
+(@PATH,13,-609.1469,2570.99,81.41309,0,0,0,0,100,0); -- 15:21:47
+-- 0x203CC84240124A400000440003351C35 .go -620.3628 2564.344 79.32322
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+4;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-689.8017,`position_y`=2595.023,`position_z`=89.04801 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-689.8017,2595.023,89.04801,0,0,0,0,100,0), -- 15:23:08
+(@PATH,2,-694.9512,2616.941,90.54378,0,0,0,0,100,0), -- 15:23:09
+(@PATH,3,-677.0544,2619.867,88.82404,0,0,0,0,100,0), -- 15:23:10
+(@PATH,4,-676.0784,2598.351,87.68272,0,0,0,0,100,0), -- 15:23:11
+(@PATH,5,-695.2137,2603.727,90.68155,0,0,0,0,100,0), -- 15:23:13
+(@PATH,6,-688.4651,2622.775,90.59154,0,0,0,0,100,0), -- 15:23:14
+(@PATH,7,-671.8881,2610.943,87.61096,0,0,0,0,100,0), -- 15:23:15
+(@PATH,8,-682.2012,2594.566,88.13221,0,0,0,0,100,0), -- 15:23:16
+(@PATH,9,-695.6737,2608.772,90.66994,0,0,0,0,100,0), -- 15:23:18
+(@PATH,10,-677.1846,2619.737,88.83925,0,0,0,0,100,0), -- 15:23:19
+(@PATH,11,-676.1918,2598.365,87.90189,0,0,0,0,100,0), -- 15:23:20
+(@PATH,12,-695.1645,2603.547,90.49475,0,0,0,0,100,0), -- 15:23:21
+(@PATH,13,-688.2673,2622.599,90.37753,0,0,0,0,100,0), -- 15:23:22
+(@PATH,14,-671.6782,2610.918,87.62653,0,0,0,0,100,0), -- 15:23:23
+(@PATH,15,-682.1849,2594.786,88.28103,0,0,0,0,100,0), -- 15:23:25
+(@PATH,16,-695.7292,2608.76,90.58568,0,0,0,0,100,0), -- 15:23:26
+(@PATH,17,-683.2664,2622.867,89.8029,0,0,0,0,100,0), -- 15:23:27
+(@PATH,18,-672.1084,2603.935,87.34198,0,0,0,0,100,0), -- 15:23:28
+(@PATH,19,-695.3795,2603.66,90.5396,0,0,0,0,100,0), -- 15:23:30
+(@PATH,20,-694.9478,2616.933,90.5663,0,0,0,0,100,0), -- 15:23:31
+(@PATH,21,-677.1843,2619.85,88.79141,0,0,0,0,100,0), -- 15:23:32
+(@PATH,22,-682.2476,2594.647,88.20087,0,0,0,0,100,0), -- 15:23:33
+(@PATH,23,-695.7581,2608.89,90.5127,0,0,0,0,100,0), -- 15:23:35
+(@PATH,24,-683.1781,2622.934,89.70201,0,0,0,0,100,0), -- 15:23:36
+(@PATH,25,-672.0298,2603.892,87.34035,0,0,0,0,100,0), -- 15:23:37
+(@PATH,26,-689.723,2595.061,88.93065,0,0,0,0,100,0), -- 15:23:38
+(@PATH,27,-694.8854,2616.875,90.43231,0,0,0,0,100,0), -- 15:23:39
+(@PATH,28,-677.0415,2619.769,88.80734,0,0,0,0,100,0), -- 15:23:40
+(@PATH,29,-682.0645,2594.695,88.17558,0,0,0,0,100,0), -- 15:23:42
+(@PATH,30,-695.1677,2603.533,90.49393,0,0,0,0,100,0), -- 15:23:43
+(@PATH,31,-683.2116,2622.866,89.75854,0,0,0,0,100,0), -- 15:23:44
+(@PATH,32,-671.9715,2603.812,87.33574,0,0,0,0,100,0); -- 15:23:46
+-- 0x203CC84240124A400000440003B51C35 .go -689.8017 2595.023 89.04801
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+5;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-700.4591,`position_y`=2581.236,`position_z`=89.85777 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-700.4591,2581.236,89.85777,0,0,0,0,100,0), -- 15:21:00
+(@PATH,2,-686.7537,2594.742,88.65184,0,0,0,0,100,0), -- 15:21:01
+(@PATH,3,-681.7879,2599.051,87.94156,0,0,0,0,100,0), -- 15:21:03
+(@PATH,4,-645.0184,2615.645,85.78815,0,0,0,0,100,0), -- 15:21:04
+(@PATH,5,-652.3442,2621.35,87.0186,0,0,0,0,100,0), -- 15:21:05
+(@PATH,6,-677.1797,2618.292,88.59647,0,0,0,0,100,0), -- 15:21:06
+(@PATH,7,-692.8289,2608.688,90.29023,0,0,0,0,100,0), -- 15:21:08
+(@PATH,8,-694.9995,2595.214,89.93396,0,0,0,0,100,0); -- 15:21:09
+-- 0x203CC84240124A400000440004351C35 .go -700.4591 2581.236 89.85777
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+6;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-630.4395,`position_y`=2714.029,`position_z`=88.03479 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-630.4395,2714.029,88.03479,0,0,0,0,100,0), -- 15:20:57
+(@PATH,2,-639.6129,2702.679,89.08209,0,0,0,0,100,0), -- 15:20:58
+(@PATH,3,-653.7972,2691.186,89.59717,0,0,0,0,100,0), -- 15:20:59
+(@PATH,4,-676.4966,2688.914,93.74294,0,0,0,0,100,0), -- 15:21:00
+(@PATH,5,-668.0986,2710.315,95.53355,0,0,0,0,100,0), -- 15:21:02
+(@PATH,6,-678.1981,2712.437,96.50993,0,0,0,0,100,0), -- 15:21:03
+(@PATH,7,-689.6499,2683.876,94.61096,0,0,0,0,100,0), -- 15:21:04
+(@PATH,8,-676.4872,2670.626,91.28802,0,0,0,0,100,0), -- 15:21:06
+(@PATH,9,-648.0355,2690.657,89.56966,0,0,0,0,100,0), -- 15:21:07
+(@PATH,10,-641.1539,2694.737,89.20296,0,0,0,0,100,0), -- 15:21:08
+(@PATH,11,-622.3976,2712.029,87.43461,0,0,0,0,100,0), -- 15:21:09
+(@PATH,12,-618.0607,2730.373,86.00659,0,0,0,0,100,0), -- 15:21:10
+(@PATH,13,-639.5991,2702.866,89.00571,0,0,0,0,100,0), -- 15:21:12
+(@PATH,14,-653.4491,2691.407,89.64917,0,0,0,0,100,0), -- 15:21:13
+(@PATH,15,-675.2776,2686.989,92.92959,0,0,0,0,100,0), -- 15:21:14
+(@PATH,16,-668.0339,2710.14,95.59471,0,0,0,0,100,0), -- 15:21:15
+(@PATH,17,-678.3527,2712.485,96.54314,0,0,0,0,100,0), -- 15:21:16
+(@PATH,18,-689.8736,2688.418,95.18272,0,0,0,0,100,0), -- 15:21:18
+(@PATH,19,-680.2233,2671.275,91.65306,0,0,0,0,100,0), -- 15:21:19
+(@PATH,20,-647.9753,2690.686,89.70755,0,0,0,0,100,0), -- 15:21:20
+(@PATH,21,-641.0308,2694.546,89.32167,0,0,0,0,100,0), -- 15:21:21
+(@PATH,22,-622.1934,2711.996,87.52415,0,0,0,0,100,0), -- 15:21:23
+(@PATH,23,-618.2394,2730.46,85.93001,0,0,0,0,100,0), -- 15:21:24
+(@PATH,24,-630.5289,2714.474,87.94388,0,0,0,0,100,0), -- 15:21:25
+(@PATH,25,-653.4489,2691.482,89.69986,0,0,0,0,100,0), -- 15:21:26
+(@PATH,26,-675.2495,2687.212,92.96544,0,0,0,0,100,0), -- 15:21:27
+(@PATH,27,-668.3044,2701.24,94.87445,0,0,0,0,100,0), -- 15:21:28
+(@PATH,28,-672.5935,2718.499,95.4474,0,0,0,0,100,0), -- 15:21:30
+(@PATH,29,-689.8506,2688.373,95.21011,0,0,0,0,100,0), -- 15:21:31
+(@PATH,30,-689.2906,2680.638,93.79676,0,0,0,0,100,0), -- 15:21:32
+(@PATH,31,-647.8615,2690.679,89.63545,0,0,0,0,100,0), -- 15:21:33
+(@PATH,32,-622.1901,2712.1,87.35561,0,0,0,0,100,0), -- 15:21:36
+(@PATH,33,-613.1973,2727.032,85.68462,0,0,0,0,100,0), -- 15:21:37
+(@PATH,34,-630.4551,2714.255,87.89551,0,0,0,0,100,0); -- 15:21:38
+-- 0x203CC84240124A400000440005351C34 .go -630.4395 2714.029 88.03479
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+7;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-761.1827,`position_y`=2701.847,`position_z`=108.3081 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-761.1827,2701.847,108.3081,0,0,0,0,100,0), -- 15:21:41
+(@PATH,2,-763.432,2721.831,117.5021,0,0,0,0,100,0), -- 15:21:42
+(@PATH,3,-773.3309,2720.005,117.13,0,0,0,0,100,0), -- 15:21:43
+(@PATH,4,-788.311,2733.121,117.8913,0,0,0,0,100,0), -- 15:21:44
+(@PATH,5,-758.8734,2722.237,116.7121,0,0,0,0,100,0), -- 15:21:46
+(@PATH,6,-750.6326,2715.539,113.1729,0,0,0,0,100,0), -- 15:21:47
+(@PATH,7,-740.0147,2690.306,104.178,0,0,0,0,100,0), -- 15:21:48
+(@PATH,8,-752.843,2679.486,101.8023,0,0,0,0,100,0), -- 15:21:49
+(@PATH,9,-784.1663,2686.454,104.5872,0,0,0,0,100,0), -- 15:21:50
+(@PATH,10,-795.9035,2686.967,105.288,0,0,0,0,100,0), -- 15:21:52
+(@PATH,11,-807.5844,2704.689,108.8084,0,0,0,0,100,0), -- 15:21:53
+(@PATH,12,-790.9392,2709.087,109.056,0,0,0,0,100,0), -- 15:21:54
+(@PATH,13,-783.5266,2701.725,107.6792,0,0,0,0,100,0), -- 15:21:55
+(@PATH,14,-762.7386,2720.122,116.8518,0,0,0,0,100,0), -- 15:21:57
+(@PATH,15,-773.3821,2719.644,116.9987,0,0,0,0,100,0), -- 15:21:58
+(@PATH,16,-797.9175,2733.678,117.4854,0,0,0,0,100,0), -- 15:21:59
+(@PATH,17,-758.7566,2722.274,116.7635,0,0,0,0,100,0), -- 15:22:00
+(@PATH,18,-750.7303,2715.479,113.2036,0,0,0,0,100,0), -- 15:22:01
+(@PATH,19,-742.5223,2706.447,109.2216,0,0,0,0,100,0), -- 15:22:03
+(@PATH,20,-753.0249,2679.495,101.9872,0,0,0,0,100,0), -- 15:22:04
+(@PATH,21,-767.0206,2684.747,103.4404,0,0,0,0,100,0), -- 15:22:05
+(@PATH,22,-795.8685,2687.028,105.4345,0,0,0,0,100,0), -- 15:22:06
+(@PATH,23,-807.5786,2704.569,108.8766,0,0,0,0,100,0), -- 15:22:08
+(@PATH,24,-806.0139,2706.778,109.1797,0,0,0,0,100,0), -- 15:22:09
+(@PATH,25,-783.2947,2701.656,107.6781,0,0,0,0,100,0), -- 15:22:10
+(@PATH,26,-762.7495,2720.095,116.9874,0,0,0,0,100,0), -- 15:22:11
+(@PATH,27,-773.2406,2719.672,116.9973,0,0,0,0,100,0), -- 15:22:12
+(@PATH,28,-795.0907,2729.675,117.6628,0,0,0,0,100,0), -- 15:22:14
+(@PATH,29,-788.4598,2733.199,117.8639,0,0,0,0,100,0), -- 15:22:15
+(@PATH,30,-754.7383,2719.982,115.1603,0,0,0,0,100,0), -- 15:22:16
+(@PATH,31,-742.5227,2706.411,109.1998,0,0,0,0,100,0), -- 15:22:17
+(@PATH,32,-740.782,2688.58,103.606,0,0,0,0,100,0), -- 15:22:18
+(@PATH,33,-767.0979,2684.736,103.8746,0,0,0,0,100,0), -- 15:22:20
+(@PATH,34,-784.1396,2686.581,104.4419,0,0,0,0,100,0), -- 15:22:21
+(@PATH,35,-802.2366,2687.199,105.5248,0,0,0,0,100,0), -- 15:22:22
+(@PATH,36,-805.9133,2706.766,109.1137,0,0,0,0,100,0), -- 15:22:23
+(@PATH,37,-783.6552,2701.552,107.567,0,0,0,0,100,0); -- 15:22:25
+-- 0x203CC84240124A400000440005B51C34 .go -761.1827 2701.847 108.3081
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+8;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-696.4537,`position_y`=2672.248,`position_z`=94.02368 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-696.4537,2672.248,94.02368,0,0,0,0,100,0), -- 15:22:22
+(@PATH,2,-715.4374,2665.521,94.87578,0,0,0,0,100,0), -- 15:22:23
+(@PATH,3,-691.6254,2645.292,93.06143,0,0,0,0,100,0), -- 15:22:25
+(@PATH,4,-687.4556,2661.372,93.48894,0,0,0,0,100,0), -- 15:22:26
+(@PATH,5,-696.2938,2672.279,94.02504,0,0,0,0,100,0), -- 15:22:27
+(@PATH,6,-715.679,2654.232,94.33944,0,0,0,0,100,0), -- 15:22:28
+(@PATH,7,-691.636,2645.265,93.06179,0,0,0,0,100,0), -- 15:22:29
+(@PATH,8,-687.5698,2661.478,93.46684,0,0,0,0,100,0), -- 15:22:31
+(@PATH,9,-706.7507,2672.399,94.58054,0,0,0,0,100,0), -- 15:22:32
+(@PATH,10,-715.6765,2654.364,94.39523,0,0,0,0,100,0), -- 15:22:33
+(@PATH,11,-691.6421,2645.341,93.04417,0,0,0,0,100,0), -- 15:22:34
+(@PATH,12,-687.571,2661.364,93.44951,0,0,0,0,100,0); -- 15:22:35
+-- 0x203CC84240124A400000440006351C34 .go -696.4537 2672.248 94.02368
+
+-- Pathing for Infernal Rain (Hellfire) Entry: 18729 'TDB FORMAT'
+SET @NPC := @CGUID+9;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-736.5909,`position_y`=2643.926,`position_z`=99.57889 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-736.5909,2643.926,99.57889,0,0,0,0,100,0), -- 15:21:12
+(@PATH,2,-739.5054,2650.205,101.1051,0,0,0,0,100,0), -- 15:21:13
+(@PATH,3,-751.2732,2672.356,100.7091,0,0,0,0,100,0), -- 15:21:14
+(@PATH,4,-739.7455,2691.94,104.7795,0,0,0,0,100,0), -- 15:21:15
+(@PATH,5,-725.373,2704.028,98.12045,0,0,0,0,100,0), -- 15:21:31
+(@PATH,6,-719.1994,2702.7,96.82434,0,0,0,0,100,0), -- 15:21:16
+(@PATH,7,-704.6559,2687.181,95.32121,0,0,0,0,100,0), -- 15:21:18
+(@PATH,8,-725.9246,2683.021,99.72587,0,0,0,0,100,0), -- 15:21:19
+(@PATH,9,-741.8126,2673.67,98.87859,0,0,0,0,100,0), -- 15:21:20
+(@PATH,10,-734.7253,2659.843,97.42217,0,0,0,0,100,0), -- 15:21:21
+(@PATH,11,-720.5742,2666.832,95.61575,0,0,0,0,100,0), -- 15:21:23
+(@PATH,12,-731.9807,2650.673,97.47429,0,0,0,0,100,0), -- 15:21:24
+(@PATH,13,-715.4817,2625.815,91.41167,0,0,0,0,100,0); -- 15:21:25
+-- 0x203CC84240124A400000440007351C34 .go -736.5909 2643.926 99.57889
+
+-- Add text for watch_commander_leonus
+DELETE FROM `creature_text` WHERE `CreatureID`=19392;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(19392, 0, 0, 'WE''RE UNDER ATTACK! RUN FOR COVER!', 14, 0, 100, 0, 0, 0, 16575, 0, 'Watch Commander Leonus'),
+(19392, 0, 1, 'INFERNALS! CLEAR THE COURTYARD!', 14, 0, 100, 0, 0, 0, 16574, 0, 'Watch Commander Leonus'),
+(19392, 0, 2, 'INFERNAL RAIN ON THE RISE! TAKE COVER!', 14, 0, 100, 0, 0, 0, 16573, 0, 'Watch Commander Leonus');
+
+-- Condition for source Spell implicit target condition type Near creature
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=2 AND `SourceEntry`=33814 AND `SourceId`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 2, 33814, 0, 0, 29, 0, 18729, 1000, 0, 0, 0, 0, '', 'Spell SPELL_INFERNAL_RAIN (effect 1) will hit the potential target of the spell if target is unit NPC_INFERNAL_RAIN within 1000 yards.');
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_17_world_from_335_was_2018_01_12_03_world.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_17_world_from_335_was_2018_01_12_03_world.sql
new file mode 100644
index 00000000000..333dfdfa44a
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_17_world_from_335_was_2018_01_12_03_world.sql
@@ -0,0 +1 @@
+ALTER TABLE `smart_scripts` ADD COLUMN `event_param5` INT(10) UNSIGNED DEFAULT 0 NOT NULL AFTER `event_param4`;
diff --git a/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_18_world_from_335_was_2018_01_13_00_world_335.sql b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_18_world_from_335_was_2018_01_13_00_world_335.sql
new file mode 100644
index 00000000000..038548f567b
--- /dev/null
+++ b/sql/old/4.3.4/world/25_2018_01_15/2018_01_14_18_world_from_335_was_2018_01_13_00_world_335.sql
@@ -0,0 +1,198 @@
+--
+DELETE FROM `game_event` WHERE `eventEntry`=76;
+INSERT INTO `game_event` (`eventEntry`, `start_time`, `end_time`, `occurence`, `length`, `holiday`, `holidayStage`, `description`, `world_event`, `announce`) VALUES
+(76, '2018-01-01 07:00:00', '2020-01-01 08:00:00', 1440, 60, 0, 0, 'Childeren of Goldshire', 0, 2);
+
+UPDATE `creature_template` SET `ScriptName`='npc_cameron' WHERE `entry`=805;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=280697;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(280697, 280697, 0, 0, 515), -- Cameron
+(280697, 280040, 3, 230, 515), -- John
+(280697, 280043, 3, 180, 515), -- Dana
+(280697, 280042, 3, 130, 515), -- Jose
+(280697, 280696, 3, 310, 515), -- Lisa
+(280697, 280041, 3, 50, 515); -- Aaron
+
+-- STORMWIND_PATH
+SET @ENTRY := 80500;
+DELETE FROM `waypoint_data` WHERE `id`=@ENTRY;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@ENTRY,1 ,-9372.823,-66.29554,69.201859, 0, 0, 1, 0, 100, 0),
+(@ENTRY,2 ,-9375.251,-70.71793,69.201691, 0, 0, 1, 0, 100, 0),
+(@ENTRY,3 ,-9377.161,-72.19738,69.198997, 0, 0, 1, 0, 100, 0),
+(@ENTRY,4 ,-9382.018,-76.88008,69.164696, 0, 0, 1, 0, 100, 0),
+(@ENTRY,5 ,-9385.052,-76.36288,69.202148, 0, 0, 1, 0, 100, 0),
+(@ENTRY,6 ,-9392.218,-71.91143,64.437691, 0, 0, 1, 0, 100, 0),
+(@ENTRY,7 ,-9390.718,-68.80339,64.437691, 0, 0, 1, 0, 100, 0),
+(@ENTRY,8 ,-9380.336,-78.55399,64.437691, 0, 0, 1, 0, 100, 0),
+(@ENTRY,9 ,-9383.135,-84.98008,63.336449, 0, 0, 1, 0, 100, 0),
+(@ENTRY,10,-9376.598,-89.94442,63.722805, 0, 0, 1, 0, 100, 0),
+(@ENTRY,11,-9372.031,-87.89227,64.235367, 0, 0, 1, 0, 100, 0),
+(@ENTRY,12,-9357.252,-67.5625,65.31458, 0, 0, 1, 0, 100, 0), -- 07:00:21
+(@ENTRY,13,-9357.252,-67.5625,65.31458, 0, 0, 1, 0, 100, 0), -- 07:00:21
+(@ENTRY,14,-9356.818,-59.81693,66.47333, 0, 0, 1, 0, 100, 0), -- 07:00:23
+(@ENTRY,15,-9359.703,-40.74677,64.90179, 0, 0, 1, 0, 100, 0), -- 07:00:24
+(@ENTRY,16,-9366.912,-26.63774,63.58042, 0, 0, 1, 0, 100, 0), -- 07:00:27
+(@ENTRY,17,-9376.815,-16.4907,62.47466, 0, 0, 1, 0, 100, 0), -- 07:00:29
+(@ENTRY,18,-9390.682,0.2398973,60.84456, 0, 0, 1, 0, 100, 0), -- 07:00:30
+(@ENTRY,19,-9402.53,14.60529,59.79248, 0, 0, 1, 0, 100, 0), -- 07:00:34
+(@ENTRY,20,-9419.141,34.55973,57.84264, 0, 0, 1, 0, 100, 0), -- 07:00:35
+(@ENTRY,21,-9426.896,43.84751,57.06255, 0, 0, 1, 0, 100, 0), -- 07:00:40
+(@ENTRY,22,-9433.867,53.78213,56.78226, 0, 0, 1, 0, 100, 0), -- 07:00:41
+(@ENTRY,23,-9438.548,61.02147,56.39376, 0, 0, 1, 0, 100, 0), -- 07:00:42
+(@ENTRY,24,-9436.482,68.04466,56.42494, 0, 0, 1, 0, 100, 0), -- 07:00:44
+(@ENTRY,25,-9415.27,87.07191,57.30513, 0, 0, 1, 0, 100, 0), -- 07:00:45
+(@ENTRY,26,-9396.235,98.29691,59.15154, 0, 0, 1, 0, 100, 0), -- 07:00:47
+(@ENTRY,27,-9375.271,106.7702,60.70432, 0, 0, 1, 0, 100, 0), -- 07:00:51
+(@ENTRY,28,-9364.256,110.7547,61.50436, 0, 0, 1, 0, 100, 0), -- 07:00:53
+(@ENTRY,29,-9344.307,120.2394,63.43427, 0, 0, 1, 0, 100, 0), -- 07:00:55
+(@ENTRY,30,-9332.738,126.8489,63.9777, 0, 0, 1, 0, 100, 0), -- 07:00:57
+(@ENTRY,31,-9308.697,137.7139,65.57498, 0, 0, 1, 0, 100, 0), -- 07:00:59
+(@ENTRY,32,-9292.605,144.2936,66.53963, 0, 0, 1, 0, 100, 0), -- 07:01:03
+(@ENTRY,33,-9271.355,152.9366,67.37766, 0, 0, 1, 0, 100, 0), -- 07:01:04
+(@ENTRY,34,-9258.908,158.3268,67.75345, 0, 0, 1, 0, 100, 0), -- 07:01:07
+(@ENTRY,35,-9258.107,158.9872,67.80977, 0, 0, 1, 0, 100, 0), -- 07:01:08
+(@ENTRY,36,-9245.959,170.1512,68.25052, 0, 0, 1, 0, 100, 0), -- 07:01:10
+(@ENTRY,37,-9219.314,201.358,69.06726, 0, 0, 1, 0, 100, 0), -- 07:01:13
+(@ENTRY,38,-9208.215,212.5414,70.81392, 0, 0, 1, 0, 100, 0), -- 07:01:17
+(@ENTRY,39,-9198.92,222.5978,71.63802, 0, 0, 1, 0, 100, 0), -- 07:01:18
+(@ENTRY,40, -9194.827, 227.36, 71.91199, 0, 0, 1, 0, 100, 0), -- 07:01:20
+(@ENTRY,41,-9187.375,241.8835,72.91473, 0, 0, 1, 0, 100, 0), -- 07:01:21
+(@ENTRY,42,-9184.045,254.7417,73.77821, 0, 0, 1, 0, 100, 0), -- 07:01:23
+(@ENTRY,43,-9182.289,274.1739,75.36765, 0, 0, 1, 0, 100, 0), -- 07:01:25
+(@ENTRY,44,-9181.092,289.6617,77.20319, 0, 0, 1, 0, 100, 0), -- 07:01:26
+(@ENTRY,45,-9180.633,300.7958,78.49542, 0, 0, 1, 0, 100, 0), -- 07:01:29
+(@ENTRY,46,-9178.008,326.7234,81.67275, 0, 0, 1, 0, 100, 0), -- 07:01:31
+(@ENTRY,47,-9174.055,336.8582,84.08626, 0, 0, 1, 0, 100, 0), -- 07:01:34
+(@ENTRY,48,-9163.633,351.4775,87.70863, 0, 0, 1, 0, 100, 0), -- 07:01:35
+(@ENTRY,49,-9153.682,362.516,90.23949, 0, 0, 1, 0, 100, 0), -- 07:01:37
+(@ENTRY,50,-9148.218,368.3586,90.66177, 0, 0, 1, 0, 100, 0), -- 07:01:40
+(@ENTRY,51,-9125.46,390.1248,91.81776, 0, 0, 1, 0, 100, 0), -- 07:01:43
+(@ENTRY,52,-9115.926,397.5776,92.71513, 0, 0, 1, 0, 100, 0), -- 07:01:45
+(@ENTRY,53,-9095.435,413.1418,92.21481, 0, 0, 1, 0, 100, 0), -- 07:01:46
+(@ENTRY,54,-9088.044,418.7169,92.44129, 0, 0, 1, 0, 100, 0), -- 07:01:49
+(@ENTRY,55,-9058.086,439.64,93.14257, 0, 0, 1, 0, 100, 0), -- 07:01:52
+(@ENTRY,56,-9045.07,450.092,93.28775, 0, 0, 1, 0, 100, 0), -- 07:01:54
+(@ENTRY,57,-9040.674,453.6961,93.05584, 0, 0, 0, 0, 100, 0);
+
+-- GOLDSHIRE_PATH
+SET @ENTRY := 80501;
+DELETE FROM `waypoint_data` WHERE `id`=@ENTRY;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@ENTRY, 1 ,-9057.086,442.696,93.05582, 0, 0, 1, 0, 100, 0), -- 07:13:02
+(@ENTRY, 2 ,-9074.805,431.4119,93.05582, 0, 0, 1, 0, 100, 0), -- 07:13:03
+(@ENTRY, 3 ,-9077.455,426.727,92.54478, 0, 0, 1, 0, 100, 0), -- 07:13:05
+(@ENTRY, 4 ,-9130.008,384.1526,91.08342, 0, 0, 1, 0, 100, 0), -- 07:13:11
+(@ENTRY, 5 ,-9138.167,378.1005,90.83872, 0, 0, 1, 0, 100, 0), -- 07:13:14
+(@ENTRY, 6 ,-9170.719,340.1506,85.00079, 0, 0, 1, 0, 100, 0), -- 07:13:17
+(@ENTRY, 7 ,-9177.553,324.4485,81.63397, 0, 0, 1, 0, 100, 0), -- 07:13:22
+(@ENTRY, 8 ,-9179.79,302.5313,78.90688, 0, 0, 1, 0, 100, 0), -- 07:13:24
+(@ENTRY, 9 ,-9180.076,284.7124,76.62807, 0, 0, 1, 0, 100, 0), -- 07:13:26
+(@ENTRY, 10 ,-9180.527,273.4619,75.51992, 0, 0, 1, 0, 100, 0), -- 07:13:29
+(@ENTRY, 11 ,-9181.712,261.4136,74.55137, 0, 0, 1, 0, 100, 0), -- 07:13:30
+(@ENTRY, 12 ,-9187.871,242.3035,72.95731, 0, 0, 1, 0, 100, 0), -- 07:13:32
+(@ENTRY, 13 ,-9199.146,222.4604,71.7192, 0, 0, 1, 0, 100, 0), -- 07:13:35
+(@ENTRY, 14 ,-9217.201,203.2024,69.32413, 0, 0, 1, 0, 100, 0), -- 07:13:37
+(@ENTRY, 15 ,-9230.155,189.5526,68.19696, 0, 0, 1, 0, 100, 0), -- 07:13:41
+(@ENTRY, 16 ,-9241.491,176.5851,67.95673, 0, 0, 1, 0, 100, 0), -- 07:13:45
+(@ENTRY, 17 ,-9263.844,156.9561,67.57113, 0, 0, 1, 0, 100, 0), -- 07:13:46
+(@ENTRY, 18 ,-9267.183,155.5535,67.38669, 0, 0, 1, 0, 100, 0), -- 07:13:48
+(@ENTRY, 19 ,-9276.685,152.7653,67.1469, 0, 0, 1, 0, 100, 0), -- 07:13:50
+(@ENTRY, 20 ,-9299.891,144.6541,66.28534, 0, 0, 1, 0, 100, 0), -- 07:13:52
+(@ENTRY, 21 ,-9319.277,135.1606,65.03548, 0, 0, 1, 0, 100, 0), -- 07:13:53
+(@ENTRY, 22 ,-9332.896,126.1193,63.87636, 0, 0, 1, 0, 100, 0), -- 07:13:57
+(@ENTRY, 23 ,-9352.381,116.5327,62.6504, 0, 0, 1, 0, 100, 0), -- 07:13:58
+(@ENTRY, 24 ,-9372.848,108.2433,60.93748, 0, 0, 1, 0, 100, 0), -- 07:14:02
+(@ENTRY, 25 ,-9390.894,102.341,59.62895, 0, 0, 1, 0, 100, 0), -- 07:14:04
+(@ENTRY, 26 ,-9395.941,100.5215,59.13963, 0, 0, 1, 0, 100, 0), -- 07:14:07
+(@ENTRY, 27 ,-9409.482,92.83659,58.09391, 0, 0, 1, 0, 100, 0), -- 07:14:08
+(@ENTRY, 28 ,-9417.838,86.17823,57.23439, 0, 0, 1, 0, 100, 0), -- 07:14:09
+(@ENTRY, 29 ,-9433.703,74.28316,56.51966, 0, 0, 1, 0, 100, 0), -- 07:14:10
+(@ENTRY, 30 ,-9435.221,73.19769,56.34148, 0, 0, 1, 0, 100, 0), -- 07:14:13
+(@ENTRY, 31 ,-9448.541,67.65511,56.51829, 0, 0, 1, 0, 100, 0), -- 07:14:14
+(@ENTRY, 32 ,-9460.035,63.37641,55.895, 0, 0, 0, 0, 100, 0);
+
+-- WOODS_PATH
+SET @ENTRY := 80502;
+DELETE FROM `waypoint_data` WHERE `id`=@ENTRY;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@ENTRY, 1 ,-9445.364,58.4987,55.97727, 0, 0, 1, 0, 100, 0), -- 07:31:27
+(@ENTRY, 2 ,-9445.032,58.55785,56.2136, 0, 0, 1, 0, 100, 0), -- 07:31:28
+(@ENTRY, 3 ,-9427.596,41.84236,57.21891, 0, 0, 1, 0, 100, 0), -- 07:31:30
+(@ENTRY, 4 ,-9410.779,22.67539,58.65345, 0, 0, 1, 0, 100, 0), -- 07:31:32
+(@ENTRY, 5 ,-9391.792,0.02795124,60.67725, 0, 0, 1, 0, 100, 0), -- 07:31:34
+(@ENTRY, 6 ,-9377.568,-14.63209,62.37714, 0, 0, 1, 0, 100, 0), -- 07:31:38
+(@ENTRY, 7 ,-9363.139,-29.04746,63.92186, 0, 0, 1, 0, 100, 0), -- 07:31:41
+(@ENTRY, 8 ,-9348.428,-41.40288,65.24854, 0, 0, 1, 0, 100, 0), -- 07:31:43
+(@ENTRY, 9 ,-9333.074,-51.61682,66.22433, 0, 0, 1, 0, 100, 0), -- 07:31:46
+(@ENTRY, 10,-9324.543,-55.41918,66.51912, 0, 0, 1, 0, 100, 0), -- 07:31:49
+(@ENTRY, 11,-9306.514,-57.01295,66.98401, 0, 0, 1, 0, 100, 0), -- 07:31:51
+(@ENTRY, 12,-9288.65,-65.67791,67.9245, 0, 0, 1, 0, 100, 0), -- 07:31:53
+(@ENTRY, 13,-9266.111,-81.1689,69.09925, 0, 0, 1, 0, 100, 0), -- 07:31:55
+(@ENTRY, 14,-9246.279,-94.43002,70.69906, 0, 0, 1, 0, 100, 0), -- 07:31:57
+(@ENTRY, 15,-9241.527,-97.61461,70.86122, 0, 0, 1, 0, 100, 0), -- 07:32:01
+(@ENTRY, 16,-9228.587,-103.1802,71.24693, 0, 0, 1, 0, 100, 0), -- 07:32:02
+(@ENTRY, 17,-9202.936,-110.5503,71.32005, 0, 0, 1, 0, 100, 0), -- 07:32:06
+(@ENTRY, 18,-9189.19,-111.8865,71.32235, 0, 0, 1, 0, 100, 0), -- 07:32:07
+(@ENTRY, 19,-9164.87,-117.8934,73.10243, 0, 0, 1, 0, 100, 0), -- 07:32:10
+(@ENTRY, 20,-9164.276,-118.5964,73.10841, 0, 0, 1, 0, 100, 0), -- 07:32:11
+(@ENTRY, 21,-9157.389,-130.045,74.83447, 0, 0, 1, 0, 100, 0), -- 07:32:12
+(@ENTRY, 22,-9155.88,-137.6466,74.73592, 0, 0, 0, 0, 100, 0);
+
+-- HOUSE_PATH
+SET @ENTRY := 80503;
+DELETE FROM `waypoint_data` WHERE `id`=@ENTRY;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@ENTRY, 1 ,-9158.411,-126.9952,74.33096, 0, 0, 0, 0, 100, 0), -- 07:38:14
+(@ENTRY, 2 ,-9161.936,-122.2632,73.48005, 0, 0, 0, 0, 100, 0), -- 07:38:18
+(@ENTRY, 3 ,-9171.188,-116.403,72.13133, 0, 0, 0, 0, 100, 0), -- 07:38:23
+(@ENTRY, 4 ,-9175.792,-115.2302,71.66595, 0, 0, 0, 0, 100, 0), -- 07:38:26
+(@ENTRY, 5 ,-9188.126,-113.6762,71.1235, 0, 0, 0, 0, 100, 0), -- 07:38:31
+(@ENTRY, 6 ,-9198.314,-111.6536,71.19713, 0, 0, 0, 0, 100, 0), -- 07:38:36
+(@ENTRY, 7 ,-9212.777,-108.1362,71.49892, 0, 0, 0, 0, 100, 0), -- 07:38:41
+(@ENTRY, 8 ,-9221.962,-106.0956,71.29646, 0, 0, 0, 0, 100, 0), -- 07:38:46
+(@ENTRY, 9 ,-9238.102,-98.25057,71.02353, 0, 0, 0, 0, 100, 0), -- 07:38:52
+(@ENTRY, 10,-9255.748,-87.4807,70.21791, 0, 0, 0, 0, 100, 0), -- 07:38:55
+(@ENTRY, 11,-9262.821,-82.41038,69.39944, 0, 0, 0, 0, 100, 0), -- 07:39:01
+(@ENTRY, 12,-9267.083,-79.06253,68.88945, 0, 0, 0, 0, 100, 0), -- 07:39:06
+(@ENTRY, 13,-9277.369,-71.58946,68.45795, 0, 0, 0, 0, 100, 0), -- 07:39:11
+(@ENTRY, 14,-9294.043,-62.51098,67.73149, 0, 0, 0, 0, 100, 0), -- 07:39:15
+(@ENTRY, 15,-9296.369,-61.36803,67.39666, 0, 0, 0, 0, 100, 0), -- 07:39:20
+(@ENTRY, 16,-9306.391,-58.70887,67.12717, 0, 0, 0, 0, 100, 0), -- 07:39:23
+(@ENTRY, 17,-9314.822,-57.41774,66.82509, 0, 0, 0, 0, 100, 0), -- 07:39:27
+(@ENTRY, 18,-9336.649,-53.8809,66.1555, 0, 0, 0, 0, 100, 0), -- 07:39:31
+(@ENTRY, 19,-9337.359,-53.52038,65.92425, 0, 0, 0, 0, 100, 0), -- 07:39:37
+(@ENTRY, 20,-9350.479,-55.02436,66.34923, 0, 0, 0, 0, 100, 0), -- 07:39:40
+(@ENTRY, 21,-9351.158,-55.39683,66.35679, 0, 0, 0, 0, 100, 0), -- 07:39:43
+(@ENTRY, 22,-9359.373,-69.76035,64.45229, 0, 0, 0, 0, 100, 0), -- 07:39:44
+(@ENTRY, 23,-9360.618,-71.72406,64.24545, 0, 0, 0, 0, 100, 0), -- 07:39:50
+(@ENTRY, 24,-9366.256,-80.96321,64.52115, 0, 0, 0, 0, 100, 0), -- 07:39:54
+(@ENTRY, 25,-9372.031,-87.89227,64.235367, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 26,-9376.598,-89.94442,63.722805, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 27,-9383.135,-84.98008,63.336449, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 28,-9380.336,-78.55399,64.437691, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 29,-9390.718,-68.80339,64.437691, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 30,-9392.218,-71.91143,64.437691, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 31,-9385.052,-76.36288,69.202148, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 32,-9382.018,-76.88008,69.164696, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 33,-9377.161,-72.19738,69.198997, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 34,-9375.251,-70.71793,69.201691, 0, 0, 0, 0, 100, 0),
+(@ENTRY, 35,-9372.823,-66.29554,69.201859, 0, 0, 0, 0, 100, 0);
+
+-- Lisa run away waypoints
+SET @ENTRY := 80700;
+DELETE FROM `waypoint_data` WHERE `id`=@ENTRY;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@ENTRY, 1,-9154.618,-134.9246,75.17611, 0, 0, 1, 0, 100, 0), -- 07:32:15
+(@ENTRY, 2,-9155.719,-132.458,75.17039, 0, 0, 1, 0, 100, 0), -- 07:32:15
+(@ENTRY, 3,-9340.689,-89.09771,66.49249, 0, 0, 1, 0, 100, 0), -- 07:32:27
+(@ENTRY, 4,-9353.076,-86.58789,65.68958, 0, 0, 0, 0, 100, 0); -- 07:33:47
+
+-- Correct position for each child
+UPDATE `creature` SET `position_x`=-9373.521, `position_y`=-67.71767, `position_z`=69.201965, `orientation`=1.117011 WHERE `guid`=280696;
+UPDATE `creature` SET `position_x`=-9374.94, `position_y`=-62.51654, `position_z`=69.201965, `orientation`=5.201081 WHERE `guid`=280041;
+UPDATE `creature` SET `position_x`=-9371.013, `position_y`=-71.20811, `position_z`=69.201965, `orientation`=1.937315 WHERE `guid`=280042;
+UPDATE `creature` SET `position_x`=-9368.419, `position_y`=-66.47543, `position_z`=69.201965, `orientation`=3.141593 WHERE `guid`=280697;
+UPDATE `creature` SET `position_x`=-9372.376, `position_y`=-65.49946, `position_z`=69.201965, `orientation`=4.206244 WHERE `guid`=280043;
+UPDATE `creature` SET `position_x`=-9377.477, `position_y`=-67.8297, `position_z`=69.201965, `orientation`=0.296706 WHERE `guid`=280040;
diff --git a/sql/updates/auth/4.3.4/2018_01_15_00_auth.sql b/sql/updates/auth/4.3.4/2018_01_15_00_auth.sql
new file mode 100644
index 00000000000..17e21a54197
--- /dev/null
+++ b/sql/updates/auth/4.3.4/2018_01_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-26 auth database
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/4.3.4/2018_01_15_00_characters.sql b/sql/updates/characters/4.3.4/2018_01_15_00_characters.sql
new file mode 100644
index 00000000000..aa59ba85853
--- /dev/null
+++ b/sql/updates/characters/4.3.4/2018_01_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-26 characters database
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/4.3.4/2018_01_15_00_world.sql b/sql/updates/world/4.3.4/2018_01_15_00_world.sql
new file mode 100644
index 00000000000..ec26b9bdf62
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_01_15_00_world.sql
@@ -0,0 +1,3 @@
+UPDATE `version` SET `db_version`='TDB 434.26', `cache_id`=26 LIMIT 1;
+
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql b/sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql
new file mode 100644
index 00000000000..b4f9c144e00
--- /dev/null
+++ b/sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql
@@ -0,0 +1 @@
+ALTER TABLE `gameobject_template` CHANGE `unkInt32` `RequiredLevel` int(10) NOT NULL DEFAULT '0';
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 48839d5907f..27a5495b3d8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3e238a8c367..65cd3c5bdb8 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/common/Collision/BoundingIntervalHierarchy.cpp b/src/common/Collision/BoundingIntervalHierarchy.cpp
index 448025c2c92..78070f3e171 100644
--- a/src/common/Collision/BoundingIntervalHierarchy.cpp
+++ b/src/common/Collision/BoundingIntervalHierarchy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h
index a80759f6cf7..c9d95f8736c 100644
--- a/src/common/Collision/BoundingIntervalHierarchy.h
+++ b/src/common/Collision/BoundingIntervalHierarchy.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
index b7f78ea7baf..adbc6754fa4 100644
--- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h
+++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp
index fc79978be3f..750e155da87 100644
--- a/src/common/Collision/DynamicTree.cpp
+++ b/src/common/Collision/DynamicTree.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h
index 4ba30e14e48..7dd7b149088 100644
--- a/src/common/Collision/DynamicTree.h
+++ b/src/common/Collision/DynamicTree.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
index a89fefa9d63..3f5282c0e37 100644
--- a/src/common/Collision/Management/IVMapManager.h
+++ b/src/common/Collision/Management/IVMapManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp
index 64948956c73..240dbc60637 100644
--- a/src/common/Collision/Management/MMapFactory.cpp
+++ b/src/common/Collision/Management/MMapFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h
index 770cec1bf1a..a8d6d0473a3 100644
--- a/src/common/Collision/Management/MMapFactory.h
+++ b/src/common/Collision/Management/MMapFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index d83339fb179..e2d082474d6 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h
index a0fc8a0bd71..27133ed3e04 100644
--- a/src/common/Collision/Management/MMapManager.h
+++ b/src/common/Collision/Management/MMapManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/VMapFactory.cpp b/src/common/Collision/Management/VMapFactory.cpp
index f36f237c4b2..b195955c4a9 100644
--- a/src/common/Collision/Management/VMapFactory.cpp
+++ b/src/common/Collision/Management/VMapFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/VMapFactory.h b/src/common/Collision/Management/VMapFactory.h
index 50c1c57e798..e53c37a5a4c 100644
--- a/src/common/Collision/Management/VMapFactory.h
+++ b/src/common/Collision/Management/VMapFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index f74fe2b8951..297e4053098 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -297,6 +297,8 @@ namespace VMAP
Vector3 pos = convertPositionToInternalRep(x, y, z);
if (instanceTree->second->GetLocationInfo(pos, info))
{
+ ASSERT(info.hitModel);
+ ASSERT(info.hitInstance);
data.floorZ = info.ground_Z;
uint32 liquidType = info.hitModel->GetLiquidType();
float liquidLevel;
diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index f874afdf5d4..110f2bd12f2 100644
--- a/src/common/Collision/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp
index 1fc9682d5d4..5f85a08aaef 100644
--- a/src/common/Collision/Maps/MapTree.cpp
+++ b/src/common/Collision/Maps/MapTree.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index 3a0e872c744..0c99534dda9 100644
--- a/src/common/Collision/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index 3cb60cf7a34..84e759383fb 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h
index ae0585dbd57..f370bb638ba 100644
--- a/src/common/Collision/Maps/TileAssembler.h
+++ b/src/common/Collision/Maps/TileAssembler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp
index 2ae3159a910..9643f029078 100644
--- a/src/common/Collision/Models/GameObjectModel.cpp
+++ b/src/common/Collision/Models/GameObjectModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
index 5603b2eb79b..e0de8ea7a18 100644
--- a/src/common/Collision/Models/GameObjectModel.h
+++ b/src/common/Collision/Models/GameObjectModel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Models/ModelIgnoreFlags.h b/src/common/Collision/Models/ModelIgnoreFlags.h
index beb9f965523..8e6c96e8395 100644
--- a/src/common/Collision/Models/ModelIgnoreFlags.h
+++ b/src/common/Collision/Models/ModelIgnoreFlags.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp
index 3390b233c82..a2c62bc565d 100644
--- a/src/common/Collision/Models/ModelInstance.cpp
+++ b/src/common/Collision/Models/ModelInstance.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h
index 3036ac10117..80118b9a9c2 100644
--- a/src/common/Collision/Models/ModelInstance.h
+++ b/src/common/Collision/Models/ModelInstance.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp
index d04bcf4d241..4bbf0d9a051 100644
--- a/src/common/Collision/Models/WorldModel.cpp
+++ b/src/common/Collision/Models/WorldModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h
index df472708209..5ff3300b840 100644
--- a/src/common/Collision/Models/WorldModel.h
+++ b/src/common/Collision/Models/WorldModel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h
index 5af52770dd3..22885ec3855 100644
--- a/src/common/Collision/VMapDefinitions.h
+++ b/src/common/Collision/VMapDefinitions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Collision/VMapTools.h b/src/common/Collision/VMapTools.h
index b73e524ce5a..7cbd5b8ff0e 100644
--- a/src/common/Collision/VMapTools.h
+++ b/src/common/Collision/VMapTools.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Common.cpp b/src/common/Common.cpp
index e1a5f5811df..8b1891737fe 100644
--- a/src/common/Common.cpp
+++ b/src/common/Common.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Common.h b/src/common/Common.h
index 20c442f4c07..3fdece63d18 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/CompilerDefs.h b/src/common/CompilerDefs.h
index 0509dcf9177..115a1b5329b 100644
--- a/src/common/CompilerDefs.h
+++ b/src/common/CompilerDefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Configuration/BuiltInConfig.cpp b/src/common/Configuration/BuiltInConfig.cpp
index 8ccfabbd51e..936cb2f067b 100644
--- a/src/common/Configuration/BuiltInConfig.cpp
+++ b/src/common/Configuration/BuiltInConfig.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Configuration/BuiltInConfig.h b/src/common/Configuration/BuiltInConfig.h
index cc21555f4bf..f27f15ce19f 100644
--- a/src/common/Configuration/BuiltInConfig.h
+++ b/src/common/Configuration/BuiltInConfig.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index be05916e805..4eb663ae3c6 100644
--- a/src/common/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
index 1e0f558b007..c2600b40587 100644
--- a/src/common/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/ARC4.cpp b/src/common/Cryptography/ARC4.cpp
index 1a568f99700..cc10dc39c9c 100644
--- a/src/common/Cryptography/ARC4.cpp
+++ b/src/common/Cryptography/ARC4.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/ARC4.h b/src/common/Cryptography/ARC4.h
index 3683d179609..4f7fba1f31d 100644
--- a/src/common/Cryptography/ARC4.h
+++ b/src/common/Cryptography/ARC4.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/Authentication/PacketCrypt.cpp b/src/common/Cryptography/Authentication/PacketCrypt.cpp
index 210a5fcb649..b5393e3655a 100644
--- a/src/common/Cryptography/Authentication/PacketCrypt.cpp
+++ b/src/common/Cryptography/Authentication/PacketCrypt.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Cryptography/Authentication/PacketCrypt.h b/src/common/Cryptography/Authentication/PacketCrypt.h
index 037e10613f3..af514d579a3 100644
--- a/src/common/Cryptography/Authentication/PacketCrypt.h
+++ b/src/common/Cryptography/Authentication/PacketCrypt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Cryptography/Authentication/WorldPacketCrypt.cpp b/src/common/Cryptography/Authentication/WorldPacketCrypt.cpp
index 941526d3031..ba572858645 100644
--- a/src/common/Cryptography/Authentication/WorldPacketCrypt.cpp
+++ b/src/common/Cryptography/Authentication/WorldPacketCrypt.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/Authentication/WorldPacketCrypt.h b/src/common/Cryptography/Authentication/WorldPacketCrypt.h
index 7759496f084..104ebb10827 100644
--- a/src/common/Cryptography/Authentication/WorldPacketCrypt.h
+++ b/src/common/Cryptography/Authentication/WorldPacketCrypt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp
index 3225da5bb37..69588709852 100644
--- a/src/common/Cryptography/BigNumber.cpp
+++ b/src/common/Cryptography/BigNumber.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h
index 19b3884b064..30b7e5cea3c 100644
--- a/src/common/Cryptography/BigNumber.h
+++ b/src/common/Cryptography/BigNumber.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/HmacHash.cpp b/src/common/Cryptography/HmacHash.cpp
index 02ad85185f7..f12fb0f26d1 100644
--- a/src/common/Cryptography/HmacHash.cpp
+++ b/src/common/Cryptography/HmacHash.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/HmacHash.h b/src/common/Cryptography/HmacHash.h
index b833afca99e..bf744e5b91b 100644
--- a/src/common/Cryptography/HmacHash.h
+++ b/src/common/Cryptography/HmacHash.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp
index 7a97cc2375e..cb1cf17c1c6 100644
--- a/src/common/Cryptography/OpenSSLCrypto.cpp
+++ b/src/common/Cryptography/OpenSSLCrypto.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Cryptography/OpenSSLCrypto.h b/src/common/Cryptography/OpenSSLCrypto.h
index 9fc13119291..100a1c4eb3a 100644
--- a/src/common/Cryptography/OpenSSLCrypto.h
+++ b/src/common/Cryptography/OpenSSLCrypto.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Cryptography/SHA1.cpp b/src/common/Cryptography/SHA1.cpp
index 3234663f86a..4b3561cbb16 100644
--- a/src/common/Cryptography/SHA1.cpp
+++ b/src/common/Cryptography/SHA1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/SHA1.h b/src/common/Cryptography/SHA1.h
index cb3297377aa..ad564c6d617 100644
--- a/src/common/Cryptography/SHA1.h
+++ b/src/common/Cryptography/SHA1.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Cryptography/SHA256.cpp b/src/common/Cryptography/SHA256.cpp
index abb254d7f3a..b484c96db3c 100644
--- a/src/common/Cryptography/SHA256.cpp
+++ b/src/common/Cryptography/SHA256.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Cryptography/SHA256.h b/src/common/Cryptography/SHA256.h
index 14aa04ff015..40ea2750035 100644
--- a/src/common/Cryptography/SHA256.h
+++ b/src/common/Cryptography/SHA256.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Cryptography/WardenKeyGeneration.h b/src/common/Cryptography/WardenKeyGeneration.h
index 89fb4eb8deb..08c6f3470bf 100644
--- a/src/common/Cryptography/WardenKeyGeneration.h
+++ b/src/common/Cryptography/WardenKeyGeneration.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp
index 2e67f3bf539..731a779344e 100644
--- a/src/common/Debugging/Errors.cpp
+++ b/src/common/Debugging/Errors.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h
index c21972af906..867040ed829 100644
--- a/src/common/Debugging/Errors.h
+++ b/src/common/Debugging/Errors.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp
index 3223607d190..657ce5886ad 100644
--- a/src/common/Debugging/WheatyExceptionReport.cpp
+++ b/src/common/Debugging/WheatyExceptionReport.cpp
@@ -1081,6 +1081,7 @@ bool logChildren)
offset, bHandled, Name, "", false, false);
// Set Value back to an empty string since the Array object itself has no value, only its elements have
+ std::string firstElementValue = symbolDetails.top().Value;
symbolDetails.top().Value.clear();
DWORD elementsCount;
@@ -1112,10 +1113,30 @@ bool logChildren)
default:
for (DWORD index = 0; index < elementsCount && index < WER_MAX_ARRAY_ELEMENTS_COUNT; index++)
{
+ bool elementHandled = false;
PushSymbolDetail();
- symbolDetails.top().Suffix += "[" + std::to_string(index) + "]";
- FormatOutputValue(buffer, basicType, length, (PVOID)(offset + length * index), sizeof(buffer));
- symbolDetails.top().Value = buffer;
+ if (index == 0)
+ {
+ if (firstElementValue.empty())
+ {
+ FormatOutputValue(buffer, basicType, length, (PVOID)(offset + length * index), sizeof(buffer));
+ firstElementValue = buffer;
+ }
+ symbolDetails.top().Value = firstElementValue;
+ }
+ else
+ {
+ DumpTypeIndex(modBase, innerTypeID, offset + length * index, elementHandled, "", "", false, false);
+ if (!elementHandled)
+ {
+ FormatOutputValue(buffer, basicType, length, (PVOID)(offset + length * index), sizeof(buffer));
+ symbolDetails.top().Value = buffer;
+ }
+ }
+ symbolDetails.top().Prefix.clear();
+ symbolDetails.top().Type.clear();
+ symbolDetails.top().Suffix = "[" + std::to_string(index) + "]";
+ symbolDetails.top().Name.clear();
PopSymbolDetail();
}
break;
diff --git a/src/common/Define.h b/src/common/Define.h
index c1aa331b0af..eac3d9d186d 100644
--- a/src/common/Define.h
+++ b/src/common/Define.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/GitRevision.h b/src/common/GitRevision.h
index 9a31b3f1a66..b4e29cbd545 100644
--- a/src/common/GitRevision.h
+++ b/src/common/GitRevision.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/Appender.cpp b/src/common/Logging/Appender.cpp
index ec88d5fd4c1..311308bf7d8 100644
--- a/src/common/Logging/Appender.cpp
+++ b/src/common/Logging/Appender.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/Appender.h b/src/common/Logging/Appender.h
index 6a9932b7935..b8c3c119ec3 100644
--- a/src/common/Logging/Appender.h
+++ b/src/common/Logging/Appender.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/AppenderConsole.cpp b/src/common/Logging/AppenderConsole.cpp
index 3378c185cc5..76658eea8f3 100644
--- a/src/common/Logging/AppenderConsole.cpp
+++ b/src/common/Logging/AppenderConsole.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/AppenderConsole.h b/src/common/Logging/AppenderConsole.h
index c56a745bfba..c175aa3ebea 100644
--- a/src/common/Logging/AppenderConsole.h
+++ b/src/common/Logging/AppenderConsole.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/AppenderFile.cpp b/src/common/Logging/AppenderFile.cpp
index 6c68406667d..df8b44b3c8f 100644
--- a/src/common/Logging/AppenderFile.cpp
+++ b/src/common/Logging/AppenderFile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/AppenderFile.h b/src/common/Logging/AppenderFile.h
index aeb1c2d8001..295ff850f48 100644
--- a/src/common/Logging/AppenderFile.h
+++ b/src/common/Logging/AppenderFile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index 278dc23a409..0750c5e9342 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2008 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
index fa67a8ea648..bd918667846 100644
--- a/src/common/Logging/Log.h
+++ b/src/common/Logging/Log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Logging/LogOperation.cpp b/src/common/Logging/LogOperation.cpp
index 81bb98b9cce..99740d97af6 100644
--- a/src/common/Logging/LogOperation.cpp
+++ b/src/common/Logging/LogOperation.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/LogOperation.h b/src/common/Logging/LogOperation.h
index d69cd7eb0ba..641eca92683 100644
--- a/src/common/Logging/LogOperation.h
+++ b/src/common/Logging/LogOperation.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp
index 8e1f9c7ef9d..5ca4e597cdc 100644
--- a/src/common/Logging/Logger.cpp
+++ b/src/common/Logging/Logger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Logging/Logger.h b/src/common/Logging/Logger.h
index 1446062c22b..63d2cb4dfcc 100644
--- a/src/common/Logging/Logger.h
+++ b/src/common/Logging/Logger.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp
index b04fa645b67..058c3a9311e 100644
--- a/src/common/Metric/Metric.cpp
+++ b/src/common/Metric/Metric.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h
index 82befe803ea..91a0210c908 100644
--- a/src/common/Metric/Metric.h
+++ b/src/common/Metric/Metric.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Platform/ServiceWin32.cpp b/src/common/Platform/ServiceWin32.cpp
index 230fdaf17e5..558950974dc 100644
--- a/src/common/Platform/ServiceWin32.cpp
+++ b/src/common/Platform/ServiceWin32.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Platform/ServiceWin32.h b/src/common/Platform/ServiceWin32.h
index b8662d5f98a..1e64c017016 100644
--- a/src/common/Platform/ServiceWin32.h
+++ b/src/common/Platform/ServiceWin32.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h
index 286ed5509a6..f11f208a655 100644
--- a/src/common/Threading/LockedQueue.h
+++ b/src/common/Threading/LockedQueue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2008 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Threading/MPSCQueue.h b/src/common/Threading/MPSCQueue.h
index cc07be8a4ac..85e2ac4e4f7 100644
--- a/src/common/Threading/MPSCQueue.h
+++ b/src/common/Threading/MPSCQueue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Threading/ProcessPriority.h b/src/common/Threading/ProcessPriority.h
index b4ff3f5ecf6..cd17d4c0125 100644
--- a/src/common/Threading/ProcessPriority.h
+++ b/src/common/Threading/ProcessPriority.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Threading/ProducerConsumerQueue.h b/src/common/Threading/ProducerConsumerQueue.h
index 925f5d2d8ea..6b7f65b0272 100644
--- a/src/common/Threading/ProducerConsumerQueue.h
+++ b/src/common/Threading/ProducerConsumerQueue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/ByteConverter.h b/src/common/Utilities/ByteConverter.h
index 18047d0d3a5..e72e72fe681 100644
--- a/src/common/Utilities/ByteConverter.h
+++ b/src/common/Utilities/ByteConverter.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h
index a07b7f876ae..db762a67d07 100644
--- a/src/common/Utilities/Containers.h
+++ b/src/common/Utilities/Containers.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/Duration.h b/src/common/Utilities/Duration.h
index 5fa90dc14ad..91372618f66 100644
--- a/src/common/Utilities/Duration.h
+++ b/src/common/Utilities/Duration.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp
index d4ea70174c4..d7976513423 100644
--- a/src/common/Utilities/EventMap.cpp
+++ b/src/common/Utilities/EventMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/EventMap.h b/src/common/Utilities/EventMap.h
index edcc7a64455..65f8bd02da4 100644
--- a/src/common/Utilities/EventMap.h
+++ b/src/common/Utilities/EventMap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/EventProcessor.cpp b/src/common/Utilities/EventProcessor.cpp
index 07fce187ad3..40dc745a302 100644
--- a/src/common/Utilities/EventProcessor.cpp
+++ b/src/common/Utilities/EventProcessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h
index 3b924dbb3e5..ee15fdb5071 100644
--- a/src/common/Utilities/EventProcessor.h
+++ b/src/common/Utilities/EventProcessor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Utilities/IteratorPair.h b/src/common/Utilities/IteratorPair.h
index 894e1637a71..94689bccdd8 100644
--- a/src/common/Utilities/IteratorPair.h
+++ b/src/common/Utilities/IteratorPair.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/MessageBuffer.h b/src/common/Utilities/MessageBuffer.h
index 18ceb68f17f..f89fd5b07b0 100644
--- a/src/common/Utilities/MessageBuffer.h
+++ b/src/common/Utilities/MessageBuffer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/Random.cpp b/src/common/Utilities/Random.cpp
index 3a0cdedcf4b..f4902c51710 100644
--- a/src/common/Utilities/Random.cpp
+++ b/src/common/Utilities/Random.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/Random.h b/src/common/Utilities/Random.h
index ded0a6c6e5c..9e13e7cd7e0 100644
--- a/src/common/Utilities/Random.h
+++ b/src/common/Utilities/Random.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/Regex.h b/src/common/Utilities/Regex.h
index 1d1ebca1b17..f9c1cffc438 100644
--- a/src/common/Utilities/Regex.h
+++ b/src/common/Utilities/Regex.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp
index 6f4676232ca..8a88364136f 100644
--- a/src/common/Utilities/StartProcess.cpp
+++ b/src/common/Utilities/StartProcess.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/StartProcess.h b/src/common/Utilities/StartProcess.h
index 120c4f26ea6..6e912422225 100644
--- a/src/common/Utilities/StartProcess.h
+++ b/src/common/Utilities/StartProcess.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/StringFormat.h b/src/common/Utilities/StringFormat.h
index 7f41b501323..494597f5e76 100644
--- a/src/common/Utilities/StringFormat.h
+++ b/src/common/Utilities/StringFormat.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Utilities/TaskScheduler.cpp b/src/common/Utilities/TaskScheduler.cpp
index 730ef8d4b89..50e7198fe96 100644
--- a/src/common/Utilities/TaskScheduler.cpp
+++ b/src/common/Utilities/TaskScheduler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/TaskScheduler.h b/src/common/Utilities/TaskScheduler.h
index d6c399639bc..2783299285f 100644
--- a/src/common/Utilities/TaskScheduler.h
+++ b/src/common/Utilities/TaskScheduler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/common/Utilities/Timer.h b/src/common/Utilities/Timer.h
index e774808bcb0..29f49fa594b 100644
--- a/src/common/Utilities/Timer.h
+++ b/src/common/Utilities/Timer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
index 37742e5c674..4eed82fde5c 100644
--- a/src/common/Utilities/Util.cpp
+++ b/src/common/Utilities/Util.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h
index 70d7c97ef20..654e3b40181 100644
--- a/src/common/Utilities/Util.h
+++ b/src/common/Utilities/Util.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/genrev/CMakeLists.txt b/src/genrev/CMakeLists.txt
index 390a725f0d3..e722f013601 100644
--- a/src/genrev/CMakeLists.txt
+++ b/src/genrev/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 473e93afc83..ed4be76a1a9 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp
index 8299cc10937..ea017bd0cb5 100644
--- a/src/server/authserver/Authentication/AuthCodes.cpp
+++ b/src/server/authserver/Authentication/AuthCodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
index b743a9bd92f..80efec90c4c 100644
--- a/src/server/authserver/Authentication/AuthCodes.h
+++ b/src/server/authserver/Authentication/AuthCodes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/authserver/Authentication/TOTP.cpp b/src/server/authserver/Authentication/TOTP.cpp
index e26fd47e167..2d7e39d35ac 100644
--- a/src/server/authserver/Authentication/TOTP.cpp
+++ b/src/server/authserver/Authentication/TOTP.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/authserver/Authentication/TOTP.h b/src/server/authserver/Authentication/TOTP.h
index 94a3383e831..d490fb44f51 100644
--- a/src/server/authserver/Authentication/TOTP.h
+++ b/src/server/authserver/Authentication/TOTP.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 206749b702f..9f16b6853ec 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 6e67a950343..2b0987e82fb 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp
index 02400f0d45d..d308bd432d4 100644
--- a/src/server/authserver/Server/AuthSession.cpp
+++ b/src/server/authserver/Server/AuthSession.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/authserver/Server/AuthSession.h b/src/server/authserver/Server/AuthSession.h
index 12b0ca6a8f8..d3c199cac0b 100644
--- a/src/server/authserver/Server/AuthSession.h
+++ b/src/server/authserver/Server/AuthSession.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/authserver/Server/AuthSocketMgr.h b/src/server/authserver/Server/AuthSocketMgr.h
index fdcb8072e7b..781fb09e5c8 100644
--- a/src/server/authserver/Server/AuthSocketMgr.h
+++ b/src/server/authserver/Server/AuthSocketMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc
index 4e634169de9..a8270e06eab 100644
--- a/src/server/authserver/authserver.rc
+++ b/src/server/authserver/authserver.rc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/bnetserver/Authentication/AuthCodes.cpp b/src/server/bnetserver/Authentication/AuthCodes.cpp
index 947d1c5bcc8..102562a4659 100644
--- a/src/server/bnetserver/Authentication/AuthCodes.cpp
+++ b/src/server/bnetserver/Authentication/AuthCodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Authentication/AuthCodes.h b/src/server/bnetserver/Authentication/AuthCodes.h
index 16b7fe32739..febb38b93aa 100644
--- a/src/server/bnetserver/Authentication/AuthCodes.h
+++ b/src/server/bnetserver/Authentication/AuthCodes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp b/src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
index 9fdeab3f4a0..5bd52531a30 100644
--- a/src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
+++ b/src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Authentication/BattlenetPacketCrypt.h b/src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
index e71dba2b821..ae9cd9270f2 100644
--- a/src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
+++ b/src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index df7eddeb470..c954facf337 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index d7cc5b13efb..b9e029438b3 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/bnetserver/Packets/AchievementPackets.h b/src/server/bnetserver/Packets/AchievementPackets.h
index 1de30679330..5b2dfa55f47 100644
--- a/src/server/bnetserver/Packets/AchievementPackets.h
+++ b/src/server/bnetserver/Packets/AchievementPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/AuthenticationPackets.cpp b/src/server/bnetserver/Packets/AuthenticationPackets.cpp
index b266c31c6fd..777bd4afbcc 100644
--- a/src/server/bnetserver/Packets/AuthenticationPackets.cpp
+++ b/src/server/bnetserver/Packets/AuthenticationPackets.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/AuthenticationPackets.h b/src/server/bnetserver/Packets/AuthenticationPackets.h
index 32623d37097..4a744bc816d 100644
--- a/src/server/bnetserver/Packets/AuthenticationPackets.h
+++ b/src/server/bnetserver/Packets/AuthenticationPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/BitStream.cpp b/src/server/bnetserver/Packets/BitStream.cpp
index f096d2fb874..78bf5eacb97 100644
--- a/src/server/bnetserver/Packets/BitStream.cpp
+++ b/src/server/bnetserver/Packets/BitStream.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/BitStream.h b/src/server/bnetserver/Packets/BitStream.h
index 5a75d78c60d..081eeb55be1 100644
--- a/src/server/bnetserver/Packets/BitStream.h
+++ b/src/server/bnetserver/Packets/BitStream.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/CachePackets.cpp b/src/server/bnetserver/Packets/CachePackets.cpp
index 46815072008..ce3215650f6 100644
--- a/src/server/bnetserver/Packets/CachePackets.cpp
+++ b/src/server/bnetserver/Packets/CachePackets.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/CachePackets.h b/src/server/bnetserver/Packets/CachePackets.h
index 4803b7a3fbf..606a994bda7 100644
--- a/src/server/bnetserver/Packets/CachePackets.h
+++ b/src/server/bnetserver/Packets/CachePackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/ChatPackets.h b/src/server/bnetserver/Packets/ChatPackets.h
index 1fc067f4893..2063300ce3b 100644
--- a/src/server/bnetserver/Packets/ChatPackets.h
+++ b/src/server/bnetserver/Packets/ChatPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/ConnectionPackets.cpp b/src/server/bnetserver/Packets/ConnectionPackets.cpp
index 29b5202ffff..6c2d698a79f 100644
--- a/src/server/bnetserver/Packets/ConnectionPackets.cpp
+++ b/src/server/bnetserver/Packets/ConnectionPackets.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/ConnectionPackets.h b/src/server/bnetserver/Packets/ConnectionPackets.h
index d3bff3d96bf..3d6cb2c7ee6 100644
--- a/src/server/bnetserver/Packets/ConnectionPackets.h
+++ b/src/server/bnetserver/Packets/ConnectionPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/FriendsPackets.cpp b/src/server/bnetserver/Packets/FriendsPackets.cpp
index 629391ecccd..3daeaa3867e 100644
--- a/src/server/bnetserver/Packets/FriendsPackets.cpp
+++ b/src/server/bnetserver/Packets/FriendsPackets.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/FriendsPackets.h b/src/server/bnetserver/Packets/FriendsPackets.h
index 3a09d0a2829..c7f572e66b8 100644
--- a/src/server/bnetserver/Packets/FriendsPackets.h
+++ b/src/server/bnetserver/Packets/FriendsPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/PacketManager.cpp b/src/server/bnetserver/Packets/PacketManager.cpp
index 83f6be1e70a..6782c1f15eb 100644
--- a/src/server/bnetserver/Packets/PacketManager.cpp
+++ b/src/server/bnetserver/Packets/PacketManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/PacketManager.h b/src/server/bnetserver/Packets/PacketManager.h
index c7e92137fcd..e55b1ee7bcc 100644
--- a/src/server/bnetserver/Packets/PacketManager.h
+++ b/src/server/bnetserver/Packets/PacketManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/Packets.h b/src/server/bnetserver/Packets/Packets.h
index 5f8c7ae4657..48de7763428 100644
--- a/src/server/bnetserver/Packets/Packets.h
+++ b/src/server/bnetserver/Packets/Packets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/PacketsBase.cpp b/src/server/bnetserver/Packets/PacketsBase.cpp
index 5191a4484f6..5a878955a5d 100644
--- a/src/server/bnetserver/Packets/PacketsBase.cpp
+++ b/src/server/bnetserver/Packets/PacketsBase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/PacketsBase.h b/src/server/bnetserver/Packets/PacketsBase.h
index 46633276b15..f178c499faa 100644
--- a/src/server/bnetserver/Packets/PacketsBase.h
+++ b/src/server/bnetserver/Packets/PacketsBase.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/PresencePackets.cpp b/src/server/bnetserver/Packets/PresencePackets.cpp
index 16c0806880d..ea55a93f463 100644
--- a/src/server/bnetserver/Packets/PresencePackets.cpp
+++ b/src/server/bnetserver/Packets/PresencePackets.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/PresencePackets.h b/src/server/bnetserver/Packets/PresencePackets.h
index 6e762c8b06c..ad7bd299485 100644
--- a/src/server/bnetserver/Packets/PresencePackets.h
+++ b/src/server/bnetserver/Packets/PresencePackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/ProfilePackets.h b/src/server/bnetserver/Packets/ProfilePackets.h
index b526ee4a352..46c5441ef64 100644
--- a/src/server/bnetserver/Packets/ProfilePackets.h
+++ b/src/server/bnetserver/Packets/ProfilePackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/SupportPackets.h b/src/server/bnetserver/Packets/SupportPackets.h
index 31991c8aef0..26e2c2010c1 100644
--- a/src/server/bnetserver/Packets/SupportPackets.h
+++ b/src/server/bnetserver/Packets/SupportPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/WoWRealmPackets.cpp b/src/server/bnetserver/Packets/WoWRealmPackets.cpp
index 4490f6e1408..8b0ca972792 100644
--- a/src/server/bnetserver/Packets/WoWRealmPackets.cpp
+++ b/src/server/bnetserver/Packets/WoWRealmPackets.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Packets/WoWRealmPackets.h b/src/server/bnetserver/Packets/WoWRealmPackets.h
index 87dc8819195..4802004025b 100644
--- a/src/server/bnetserver/Packets/WoWRealmPackets.h
+++ b/src/server/bnetserver/Packets/WoWRealmPackets.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Realms/RealmList.cpp b/src/server/bnetserver/Realms/RealmList.cpp
index 4e8130a65fd..93c9ff6b805 100644
--- a/src/server/bnetserver/Realms/RealmList.cpp
+++ b/src/server/bnetserver/Realms/RealmList.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/bnetserver/Realms/RealmList.h b/src/server/bnetserver/Realms/RealmList.h
index 3526f74067d..c865116c1db 100644
--- a/src/server/bnetserver/Realms/RealmList.h
+++ b/src/server/bnetserver/Realms/RealmList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/bnetserver/Realms/WorldListener.cpp b/src/server/bnetserver/Realms/WorldListener.cpp
index 2e463ab341c..485fb41501f 100644
--- a/src/server/bnetserver/Realms/WorldListener.cpp
+++ b/src/server/bnetserver/Realms/WorldListener.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Realms/WorldListener.h b/src/server/bnetserver/Realms/WorldListener.h
index 17cd1f85309..dcee586f108 100644
--- a/src/server/bnetserver/Realms/WorldListener.h
+++ b/src/server/bnetserver/Realms/WorldListener.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/ComponentManager.cpp b/src/server/bnetserver/Server/ComponentManager.cpp
index 38b37fce23d..a04937e1913 100644
--- a/src/server/bnetserver/Server/ComponentManager.cpp
+++ b/src/server/bnetserver/Server/ComponentManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/ComponentManager.h b/src/server/bnetserver/Server/ComponentManager.h
index 58d0a00f8a4..4d4311673ac 100644
--- a/src/server/bnetserver/Server/ComponentManager.h
+++ b/src/server/bnetserver/Server/ComponentManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/ModuleManager.cpp b/src/server/bnetserver/Server/ModuleManager.cpp
index dc9a5b52af6..b21dabbc40c 100644
--- a/src/server/bnetserver/Server/ModuleManager.cpp
+++ b/src/server/bnetserver/Server/ModuleManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/ModuleManager.h b/src/server/bnetserver/Server/ModuleManager.h
index 84742002997..dc72c75d785 100644
--- a/src/server/bnetserver/Server/ModuleManager.h
+++ b/src/server/bnetserver/Server/ModuleManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp
index 866e78ea3d3..0766a378159 100644
--- a/src/server/bnetserver/Server/Session.cpp
+++ b/src/server/bnetserver/Server/Session.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/Session.h b/src/server/bnetserver/Server/Session.h
index f29bcf6f011..d1031a11919 100644
--- a/src/server/bnetserver/Server/Session.h
+++ b/src/server/bnetserver/Server/Session.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/SessionManager.cpp b/src/server/bnetserver/Server/SessionManager.cpp
index d4172a5c53f..e16d013ac82 100644
--- a/src/server/bnetserver/Server/SessionManager.cpp
+++ b/src/server/bnetserver/Server/SessionManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h
index 3f8878ce74c..919021a0bc2 100644
--- a/src/server/bnetserver/Server/SessionManager.h
+++ b/src/server/bnetserver/Server/SessionManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/bnetserver/bnetserver.rc b/src/server/bnetserver/bnetserver.rc
index 2b8e258436f..6c90107df17 100644
--- a/src/server/bnetserver/bnetserver.rc
+++ b/src/server/bnetserver/bnetserver.rc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt
index 0e8bd80c3b9..739ee15411c 100644
--- a/src/server/database/CMakeLists.txt
+++ b/src/server/database/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/database/Database/AdhocStatement.cpp b/src/server/database/Database/AdhocStatement.cpp
index 644af01787b..dfa4da4ead4 100644
--- a/src/server/database/Database/AdhocStatement.cpp
+++ b/src/server/database/Database/AdhocStatement.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/AdhocStatement.h b/src/server/database/Database/AdhocStatement.h
index e419908d175..1ddaea3ddf8 100644
--- a/src/server/database/Database/AdhocStatement.h
+++ b/src/server/database/Database/AdhocStatement.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseEnv.cpp b/src/server/database/Database/DatabaseEnv.cpp
index 21b937d3c76..4ab9054c1c0 100644
--- a/src/server/database/Database/DatabaseEnv.cpp
+++ b/src/server/database/Database/DatabaseEnv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseEnv.h b/src/server/database/Database/DatabaseEnv.h
index dde0d5f1847..bb63c2e913f 100644
--- a/src/server/database/Database/DatabaseEnv.h
+++ b/src/server/database/Database/DatabaseEnv.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/database/Database/DatabaseLoader.cpp b/src/server/database/Database/DatabaseLoader.cpp
index 31e4b63f46c..c40b50f40f7 100644
--- a/src/server/database/Database/DatabaseLoader.cpp
+++ b/src/server/database/Database/DatabaseLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseLoader.h b/src/server/database/Database/DatabaseLoader.h
index 472a6811f31..ed0caab26b5 100644
--- a/src/server/database/Database/DatabaseLoader.h
+++ b/src/server/database/Database/DatabaseLoader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseWorker.cpp b/src/server/database/Database/DatabaseWorker.cpp
index 54980863861..605b11a1634 100644
--- a/src/server/database/Database/DatabaseWorker.cpp
+++ b/src/server/database/Database/DatabaseWorker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseWorker.h b/src/server/database/Database/DatabaseWorker.h
index 38444706656..823287fe225 100644
--- a/src/server/database/Database/DatabaseWorker.h
+++ b/src/server/database/Database/DatabaseWorker.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
index fca4f666310..a001954d094 100644
--- a/src/server/database/Database/DatabaseWorkerPool.cpp
+++ b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/DatabaseWorkerPool.h b/src/server/database/Database/DatabaseWorkerPool.h
index b1be44adf32..e746e9e01fb 100644
--- a/src/server/database/Database/DatabaseWorkerPool.h
+++ b/src/server/database/Database/DatabaseWorkerPool.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Field.cpp b/src/server/database/Database/Field.cpp
index 29326287e63..5ab505058b6 100644
--- a/src/server/database/Database/Field.cpp
+++ b/src/server/database/Database/Field.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h
index b5eefeeb5b8..e6ae8821b11 100644
--- a/src/server/database/Database/Field.h
+++ b/src/server/database/Database/Field.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp
index 38e8d29adeb..15e160f9f8b 100644
--- a/src/server/database/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.h b/src/server/database/Database/Implementation/CharacterDatabase.h
index bb3c4da5d70..2a414c08e87 100644
--- a/src/server/database/Database/Implementation/CharacterDatabase.h
+++ b/src/server/database/Database/Implementation/CharacterDatabase.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Implementation/LoginDatabase.cpp b/src/server/database/Database/Implementation/LoginDatabase.cpp
index 8bf129bfc81..0aed48ac91b 100644
--- a/src/server/database/Database/Implementation/LoginDatabase.cpp
+++ b/src/server/database/Database/Implementation/LoginDatabase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Implementation/LoginDatabase.h b/src/server/database/Database/Implementation/LoginDatabase.h
index b138db3de48..bf9721b8c76 100644
--- a/src/server/database/Database/Implementation/LoginDatabase.h
+++ b/src/server/database/Database/Implementation/LoginDatabase.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp
index e1943131e86..c971297325c 100644
--- a/src/server/database/Database/Implementation/WorldDatabase.cpp
+++ b/src/server/database/Database/Implementation/WorldDatabase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -26,7 +26,7 @@ void WorldDatabaseConnection::DoPrepareStatements()
PrepareStatement(WORLD_DEL_CRELINKED_RESPAWN, "DELETE FROM linked_respawn WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(WORLD_REP_CREATURE_LINKED_RESPAWN, "REPLACE INTO linked_respawn (guid, linkedGuid) VALUES (?, ?)", CONNECTION_ASYNC);
PrepareStatement(WORLD_SEL_CREATURE_TEXT, "SELECT CreatureID, GroupID, ID, Text, Type, Language, Probability, Emote, Duration, Sound, BroadcastTextId, TextRange FROM creature_text", CONNECTION_SYNCH);
- PrepareStatement(WORLD_SEL_SMART_SCRIPTS, "SELECT 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 FROM smart_scripts ORDER BY entryorguid, source_type, id, link", CONNECTION_SYNCH);
+ PrepareStatement(WORLD_SEL_SMART_SCRIPTS, "SELECT entryorguid, source_type, id, link, event_type, event_phase_mask, event_chance, event_flags, event_param1, event_param2, event_param3, event_param4, event_param5, 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 FROM smart_scripts ORDER BY entryorguid, source_type, id, link", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_SMARTAI_WP, "SELECT entry, pointid, position_x, position_y, position_z FROM waypoints ORDER BY entry, pointid", CONNECTION_SYNCH);
PrepareStatement(WORLD_DEL_GAMEOBJECT, "DELETE FROM gameobject WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(WORLD_DEL_EVENT_GAMEOBJECT, "DELETE FROM game_event_gameobject WHERE guid = ?", CONNECTION_ASYNC);
diff --git a/src/server/database/Database/Implementation/WorldDatabase.h b/src/server/database/Database/Implementation/WorldDatabase.h
index 069f5fe0555..3a0a488e0fa 100644
--- a/src/server/database/Database/Implementation/WorldDatabase.h
+++ b/src/server/database/Database/Implementation/WorldDatabase.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp
index 6e862ae6abe..8451ca23815 100644
--- a/src/server/database/Database/MySQLConnection.cpp
+++ b/src/server/database/Database/MySQLConnection.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h
index 81b57261899..ff9b29dcd03 100644
--- a/src/server/database/Database/MySQLConnection.h
+++ b/src/server/database/Database/MySQLConnection.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/MySQLThreading.h b/src/server/database/Database/MySQLThreading.h
index 68a8c3ea7ed..1e46c7ffd5f 100644
--- a/src/server/database/Database/MySQLThreading.h
+++ b/src/server/database/Database/MySQLThreading.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/PreparedStatement.cpp b/src/server/database/Database/PreparedStatement.cpp
index a46a022df48..f1bfa10130d 100644
--- a/src/server/database/Database/PreparedStatement.cpp
+++ b/src/server/database/Database/PreparedStatement.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/PreparedStatement.h b/src/server/database/Database/PreparedStatement.h
index 33ef04287cd..5f740daa4d9 100644
--- a/src/server/database/Database/PreparedStatement.h
+++ b/src/server/database/Database/PreparedStatement.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryCallback.cpp b/src/server/database/Database/QueryCallback.cpp
index 2d89e08a956..d7b3332e95b 100644
--- a/src/server/database/Database/QueryCallback.cpp
+++ b/src/server/database/Database/QueryCallback.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h
index f9c93000da7..bf167a2ce23 100644
--- a/src/server/database/Database/QueryCallback.h
+++ b/src/server/database/Database/QueryCallback.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryCallbackProcessor.cpp b/src/server/database/Database/QueryCallbackProcessor.cpp
index 9f8b8fc4ad9..a0982b7c1cb 100644
--- a/src/server/database/Database/QueryCallbackProcessor.cpp
+++ b/src/server/database/Database/QueryCallbackProcessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryCallbackProcessor.h b/src/server/database/Database/QueryCallbackProcessor.h
index 0b06fd8fc27..d5ff959a32f 100644
--- a/src/server/database/Database/QueryCallbackProcessor.h
+++ b/src/server/database/Database/QueryCallbackProcessor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryHolder.cpp b/src/server/database/Database/QueryHolder.cpp
index 6a8bb701a1f..0498c67a89f 100644
--- a/src/server/database/Database/QueryHolder.cpp
+++ b/src/server/database/Database/QueryHolder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryHolder.h b/src/server/database/Database/QueryHolder.h
index c3ebb33068c..ffd7cc2bef4 100644
--- a/src/server/database/Database/QueryHolder.h
+++ b/src/server/database/Database/QueryHolder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/QueryResult.cpp b/src/server/database/Database/QueryResult.cpp
index 7b6937e50b7..c1aaf869e9b 100644
--- a/src/server/database/Database/QueryResult.cpp
+++ b/src/server/database/Database/QueryResult.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/database/Database/QueryResult.h b/src/server/database/Database/QueryResult.h
index cbbfd08b53c..59363813baf 100644
--- a/src/server/database/Database/QueryResult.h
+++ b/src/server/database/Database/QueryResult.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/database/Database/SQLOperation.h b/src/server/database/Database/SQLOperation.h
index 1e3000600c5..0bedccaa68a 100644
--- a/src/server/database/Database/SQLOperation.h
+++ b/src/server/database/Database/SQLOperation.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Transaction.cpp b/src/server/database/Database/Transaction.cpp
index 52f7062c78a..a8cb502e680 100644
--- a/src/server/database/Database/Transaction.cpp
+++ b/src/server/database/Database/Transaction.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h
index 6e6d68302f5..646b01274d2 100644
--- a/src/server/database/Database/Transaction.h
+++ b/src/server/database/Database/Transaction.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Logging/AppenderDB.cpp b/src/server/database/Logging/AppenderDB.cpp
index 1a6e11209e9..5fc739b285b 100644
--- a/src/server/database/Logging/AppenderDB.cpp
+++ b/src/server/database/Logging/AppenderDB.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Logging/AppenderDB.h b/src/server/database/Logging/AppenderDB.h
index 56f5fc13b94..ef703a21cf5 100644
--- a/src/server/database/Logging/AppenderDB.h
+++ b/src/server/database/Logging/AppenderDB.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/PrecompiledHeaders/databasePCH.cpp b/src/server/database/PrecompiledHeaders/databasePCH.cpp
index afc3186b656..2a83f984e92 100644
--- a/src/server/database/PrecompiledHeaders/databasePCH.cpp
+++ b/src/server/database/PrecompiledHeaders/databasePCH.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp
index 191091cd850..3d3576d9866 100644
--- a/src/server/database/Updater/DBUpdater.cpp
+++ b/src/server/database/Updater/DBUpdater.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Updater/DBUpdater.h b/src/server/database/Updater/DBUpdater.h
index fdc00c9d6b6..b80d0f83686 100644
--- a/src/server/database/Updater/DBUpdater.h
+++ b/src/server/database/Updater/DBUpdater.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Updater/UpdateFetcher.cpp b/src/server/database/Updater/UpdateFetcher.cpp
index 1da370ee7b9..a6656c46af8 100644
--- a/src/server/database/Updater/UpdateFetcher.cpp
+++ b/src/server/database/Updater/UpdateFetcher.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/database/Updater/UpdateFetcher.h b/src/server/database/Updater/UpdateFetcher.h
index 51f735e797f..07249e07995 100644
--- a/src/server/database/Updater/UpdateFetcher.h
+++ b/src/server/database/Updater/UpdateFetcher.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp
index e10592426d1..2e42e186605 100644
--- a/src/server/game/AI/CoreAI/CombatAI.cpp
+++ b/src/server/game/AI/CoreAI/CombatAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ int32 AggressorAI::Permissible(Creature const* creature)
{
// have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight
if (!creature->IsCivilian() && !creature->IsNeutralToAll())
- return PERMIT_BASE_PROACTIVE;
+ return PERMIT_BASE_REACTIVE;
return PERMIT_BASE_NO;
}
@@ -69,7 +69,7 @@ void CombatAI::JustDied(Unit* killer)
me->CastSpell(killer, *i, true);
}
-void CombatAI::EnterCombat(Unit* who)
+void CombatAI::JustEngagedWith(Unit* who)
{
for (SpellVct::iterator i = spells.begin(); i != spells.end(); ++i)
{
@@ -120,7 +120,7 @@ void CasterAI::InitializeAI()
m_attackDist = MELEE_RANGE;
}
-void CasterAI::EnterCombat(Unit* who)
+void CasterAI::JustEngagedWith(Unit* who)
{
if (spells.empty())
return;
diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h
index 86e95e0b209..905e1f3e8f0 100644
--- a/src/server/game/AI/CoreAI/CombatAI.h
+++ b/src/server/game/AI/CoreAI/CombatAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ class TC_GAME_API CombatAI : public CreatureAI
void InitializeAI() override;
void Reset() override;
- void EnterCombat(Unit* who) override;
+ void JustEngagedWith(Unit* who) override;
void JustDied(Unit* killer) override;
void UpdateAI(uint32 diff) override;
void SpellInterrupted(uint32 spellId, uint32 unTimeMs) override;
@@ -62,7 +62,7 @@ class TC_GAME_API CasterAI : public CombatAI
void InitializeAI() override;
void AttackStart(Unit* victim) override { AttackStartCaster(victim, m_attackDist); }
void UpdateAI(uint32 diff) override;
- void EnterCombat(Unit* /*who*/) override;
+ void JustEngagedWith(Unit* /*who*/) override;
private:
float m_attackDist;
};
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp
index 204f4c16275..2e927e35383 100644
--- a/src/server/game/AI/CoreAI/GameObjectAI.cpp
+++ b/src/server/game/AI/CoreAI/GameObjectAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h
index e72157ccd7a..02e0b03625f 100644
--- a/src/server/game/AI/CoreAI/GameObjectAI.h
+++ b/src/server/game/AI/CoreAI/GameObjectAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ class TC_GAME_API GameObjectAI
// Pass parameters between AI
virtual void DoAction(int32 /*param = 0 */) { }
- virtual void SetGUID(ObjectGuid /*guid*/, int32 /*id = 0 */) { }
+ virtual void SetGUID(ObjectGuid const& /*guid*/, int32 /*id = 0 */) { }
virtual ObjectGuid GetGUID(int32 /*id = 0 */) const { return ObjectGuid::Empty; }
static int32 Permissible(GameObject const* /*go*/) { return PERMIT_BASE_NO; }
diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index 1da03952dc9..0b3be44b1e8 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index ef35dca6e31..4ab4cc44693 100644
--- a/src/server/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp
index abbff7a870b..33a2a02a434 100644
--- a/src/server/game/AI/CoreAI/PassiveAI.cpp
+++ b/src/server/game/AI/CoreAI/PassiveAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h
index 687434559af..93b2577e9f3 100644
--- a/src/server/game/AI/CoreAI/PassiveAI.h
+++ b/src/server/game/AI/CoreAI/PassiveAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 2f06926d447..2283616df73 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -31,9 +31,6 @@
int32 PetAI::Permissible(Creature const* creature)
{
- if (creature->IsPet())
- return PERMIT_BASE_SPECIAL;
-
if (creature->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
{
if (reinterpret_cast(creature)->GetOwner()->GetTypeId() == TYPEID_PLAYER)
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index bf62aff3015..d8b4002293a 100644
--- a/src/server/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index 8ad251776b6..e0f0c2ab8a6 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h
index 443f54a284b..6020d052145 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.h
+++ b/src/server/game/AI/CoreAI/ReactorAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index 2794bbcf6dc..0bd193b01f9 100644
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 60f27f7721b..fd2cabf027b 100644
--- a/src/server/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp
index 055abc99d96..6bd4cfac3b2 100644
--- a/src/server/game/AI/CoreAI/UnitAI.cpp
+++ b/src/server/game/AI/CoreAI/UnitAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h
index 42f7cd6a63e..f55edff471f 100644
--- a/src/server/game/AI/CoreAI/UnitAI.h
+++ b/src/server/game/AI/CoreAI/UnitAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -165,7 +165,7 @@ class TC_GAME_API UnitAI
virtual void DoAction(int32 /*param*/) { }
virtual uint32 GetData(uint32 /*id = 0*/) const { return 0; }
virtual void SetData(uint32 /*id*/, uint32 /*value*/) { }
- virtual void SetGUID(ObjectGuid /*guid*/, int32 /*id*/ = 0) { }
+ virtual void SetGUID(ObjectGuid const& /*guid*/, int32 /*id*/ = 0) { }
virtual ObjectGuid GetGUID(int32 /*id*/ = 0) const { return ObjectGuid::Empty; }
Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0);
@@ -260,6 +260,13 @@ class TC_GAME_API UnitAI
targetList.resize(maxTargets);
}
+ // Called when the unit enters combat
+ // (NOTE: Creature engage logic should NOT be here, but in JustEngagedWith, which happens once threat is established!)
+ virtual void JustEnteredCombat(Unit* /*who*/) { }
+
+ // Called when the unit leaves combat
+ virtual void JustExitedCombat() { }
+
// Called at any Damage to any victim (before damage apply)
virtual void DamageDealt(Unit* /*victim*/, uint32& /*damage*/, DamageEffectType /*damageType*/) { }
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 218d60db1d9..74b761f9101 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index a0f5284f0c3..dc9483f762c 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -110,7 +110,7 @@ class TC_GAME_API CreatureAI : public UnitAI
virtual void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER);
// Called for reaction at enter to combat if not in combat yet (enemy can be nullptr)
- virtual void EnterCombat(Unit* /*victim*/) { }
+ virtual void JustEngagedWith(Unit* /*who*/) { }
// Called when the creature is killed
virtual void JustDied(Unit* /*killer*/) { }
diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
index 6681ba8bc89..c6f9e9f1ef3 100644
--- a/src/server/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -20,19 +20,15 @@
#define TRINITY_CREATUREAIFACTORY_H
#include "ObjectRegistry.h"
-#include "FactoryHolder.h"
+#include "SelectableAI.h"
-typedef FactoryHolder CreatureAICreator;
+class Creature;
+class CreatureAI;
-struct SelectableAI : public CreatureAICreator, public Permissible
+template
+struct CreatureAIFactory : public SelectableAI
{
- SelectableAI(std::string const& name) : CreatureAICreator(name), Permissible() { }
-};
-
-template
-struct CreatureAIFactory : public SelectableAI
-{
- CreatureAIFactory(std::string const& name) : SelectableAI(name) { }
+ CreatureAIFactory(std::string const& name) : SelectableAI(name) { }
inline CreatureAI* Create(Creature* c) const override
{
@@ -45,7 +41,7 @@ struct CreatureAIFactory : public SelectableAI
}
};
-typedef CreatureAICreator::FactoryHolderRegistry CreatureAIRegistry;
+typedef SelectableAI::FactoryHolderRegistry CreatureAIRegistry;
#define sCreatureAIRegistry CreatureAIRegistry::instance()
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index 7b2ecfd7f40..bdd9c624f05 100644
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index c62d20bfe4e..ef7ecce041f 100644
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@ namespace AIRegistry
(new CreatureAIFactory("PassiveAI"))->RegisterSelf();
(new CreatureAIFactory("CritterAI"))->RegisterSelf();
(new CreatureAIFactory("GuardAI"))->RegisterSelf();
- (new CreatureAIFactory("PetAI"))->RegisterSelf();
- (new CreatureAIFactory("TotemAI"))->RegisterSelf();
+ (new CreatureAIFactory("PetAI"))->RegisterSelf();
+ (new CreatureAIFactory("TotemAI"))->RegisterSelf();
(new CreatureAIFactory("CombatAI"))->RegisterSelf();
(new CreatureAIFactory("ArcherAI"))->RegisterSelf();
(new CreatureAIFactory("TurretAI"))->RegisterSelf();
diff --git a/src/server/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h
index 1a62699af63..c8f7c536785 100644
--- a/src/server/game/AI/CreatureAIRegistry.h
+++ b/src/server/game/AI/CreatureAIRegistry.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index 30b606b49c7..17a9431a94f 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -52,32 +52,42 @@ namespace FactorySelector
T const* const _obj;
};
+ template
+ inline FactoryHolder const* SelectFactory(T* obj)
+ {
+ static_assert(std::is_same::value || std::is_same::value, "Invalid template parameter");
+ static_assert(std::is_same::value == std::is_same::value, "Incompatible AI for type");
+ static_assert(std::is_same::value == std::is_same::value, "Incompatible AI for type");
+
+ using AIRegistry = typename FactoryHolder::FactoryHolderRegistry;
+
+ // AIName in db
+ std::string const& aiName = obj->GetAIName();
+ if (!aiName.empty())
+ return AIRegistry::instance()->GetRegistryItem(aiName);
+
+ // select by permit check
+ typename AIRegistry::RegistryMapType const& items = AIRegistry::instance()->GetRegisteredItems();
+ auto itr = std::max_element(items.begin(), items.end(), PermissibleOrderPred(obj));
+ if (itr != items.end() && GetPermitFor(obj, *itr) >= 0)
+ return itr->second.get();
+
+ // should _never_ happen, Null AI types defined as PERMIT_BASE_IDLE, it must've been found
+ ABORT();
+ return nullptr;
+ }
+
CreatureAI* SelectAI(Creature* creature)
{
- CreatureAICreator const* ai_factory = nullptr;
+ // special pet case, if a tamed creature uses AIName (example SmartAI) we need to override it
+ if (creature->IsPet())
+ return ASSERT_NOTNULL(sCreatureAIRegistry->GetRegistryItem("PetAI"))->Create(creature);
// scriptname in db
if (CreatureAI* scriptedAI = sScriptMgr->GetCreatureAI(creature))
return scriptedAI;
- // AIname in db
- std::string const& aiName = creature->GetAIName();
- if (!ai_factory && !aiName.empty())
- ai_factory = sCreatureAIRegistry->GetRegistryItem(aiName);
-
- // select by permit check
- if (!ai_factory)
- {
- CreatureAIRegistry::RegistryMapType const& items = sCreatureAIRegistry->GetRegisteredItems();
- auto itr = std::max_element(items.begin(), items.end(), PermissibleOrderPred(creature));
- if (itr != items.end() && GetPermitFor(creature, *itr) >= 0)
- ai_factory = itr->second.get();
- }
-
- if (!ai_factory)
- ai_factory = sCreatureAIRegistry->GetRegistryItem("NullCreatureAI");
-
- return ASSERT_NOTNULL(ai_factory)->Create(creature);
+ return SelectFactory(creature)->Create(creature);
}
MovementGenerator* SelectMovementGenerator(Unit* unit)
@@ -92,29 +102,10 @@ namespace FactorySelector
GameObjectAI* SelectGameObjectAI(GameObject* go)
{
- GameObjectAICreator const* ai_factory = nullptr;
-
// scriptname in db
if (GameObjectAI* scriptedAI = sScriptMgr->GetGameObjectAI(go))
return scriptedAI;
- // AIname in db
- std::string const& aiName = go->GetAIName();
- if (!ai_factory && !aiName.empty())
- ai_factory = sGameObjectAIRegistry->GetRegistryItem(aiName);
-
- // select by permit check
- if (!ai_factory)
- {
- GameObjectAIRegistry::RegistryMapType const& items = sGameObjectAIRegistry->GetRegisteredItems();
- auto itr = std::max_element(items.begin(), items.end(), PermissibleOrderPred(go));
- if (itr != items.end() && GetPermitFor(go, *itr) >= 0)
- ai_factory = itr->second.get();
- }
-
- if (!ai_factory)
- ai_factory = sGameObjectAIRegistry->GetRegistryItem("NullGameObjectAI");
-
- return ASSERT_NOTNULL(ai_factory)->Create(go);
+ return SelectFactory(go)->Create(go);
}
}
diff --git a/src/server/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h
index 501a39eaa87..a7eda952aca 100644
--- a/src/server/game/AI/CreatureAISelector.h
+++ b/src/server/game/AI/CreatureAISelector.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/GameObjectAIFactory.h b/src/server/game/AI/GameObjectAIFactory.h
index 2ff799ab7ea..b7d88529e29 100644
--- a/src/server/game/AI/GameObjectAIFactory.h
+++ b/src/server/game/AI/GameObjectAIFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -19,19 +19,12 @@
#define TRINITY_GAMEOBJECTAIFACTORY_H
#include "ObjectRegistry.h"
-#include "FactoryHolder.h"
+#include "SelectableAI.h"
-typedef FactoryHolder GameObjectAICreator;
-
-struct SelectableGameObjectAI : public GameObjectAICreator, public Permissible
+template
+struct GameObjectAIFactory : public SelectableAI
{
- SelectableGameObjectAI(std::string const& name) : GameObjectAICreator(name), Permissible() { }
-};
-
-template
-struct GameObjectAIFactory : public SelectableGameObjectAI
-{
- GameObjectAIFactory(std::string const& name) : SelectableGameObjectAI(name) { }
+ GameObjectAIFactory(std::string const& name) : SelectableAI(name) { }
GameObjectAI* Create(GameObject* go) const override
{
@@ -44,7 +37,7 @@ struct GameObjectAIFactory : public SelectableGameObjectAI
}
};
-typedef GameObjectAICreator::FactoryHolderRegistry GameObjectAIRegistry;
+typedef SelectableAI::FactoryHolderRegistry GameObjectAIRegistry;
#define sGameObjectAIRegistry GameObjectAIRegistry::instance()
diff --git a/src/server/game/AI/PlayerAI/PlayerAI.cpp b/src/server/game/AI/PlayerAI/PlayerAI.cpp
index e1c99b4f7a4..ab7a0f0a78a 100644
--- a/src/server/game/AI/PlayerAI/PlayerAI.cpp
+++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AI/PlayerAI/PlayerAI.h b/src/server/game/AI/PlayerAI/PlayerAI.h
index 4e93d166787..166bf37d8ea 100644
--- a/src/server/game/AI/PlayerAI/PlayerAI.h
+++ b/src/server/game/AI/PlayerAI/PlayerAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index b3c42103d67..e1a02996c87 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -444,7 +444,7 @@ void BossAI::_JustDied()
instance->SetBossState(_bossId, DONE);
}
-void BossAI::_EnterCombat()
+void BossAI::_JustEngagedWith()
{
if (instance)
{
@@ -552,7 +552,7 @@ void WorldBossAI::_JustDied()
summons.DespawnAll();
}
-void WorldBossAI::_EnterCombat()
+void WorldBossAI::_JustEngagedWith()
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true);
if (target)
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
index b4db664a980..530fe72576c 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -201,9 +201,9 @@ struct TC_GAME_API ScriptedAI : public CreatureAI
void Reset() override { }
//Called at creature aggro either by MoveInLOS or Attack Start
- void EnterCombat(Unit* /*victim*/) override { }
+ void JustEngagedWith(Unit* /*victim*/) override { }
- // Called before EnterCombat even before the creature is in combat.
+ // Called before JustEngagedWith even before the creature is in combat.
void AttackStart(Unit* /*target*/) override;
// *************
@@ -365,7 +365,7 @@ class TC_GAME_API BossAI : public ScriptedAI
virtual void ScheduleTasks() { }
void Reset() override { _Reset(); }
- void EnterCombat(Unit* /*who*/) override { _EnterCombat(); }
+ void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); }
void JustDied(Unit* /*killer*/) override { _JustDied(); }
void JustReachedHome() override { _JustReachedHome(); }
@@ -373,7 +373,7 @@ class TC_GAME_API BossAI : public ScriptedAI
protected:
void _Reset();
- void _EnterCombat();
+ void _JustEngagedWith();
void _JustDied();
void _JustReachedHome() { me->setActive(false); }
void _DespawnAtEvade(uint32 delayToRespawn = 30, Creature* who = nullptr);
@@ -407,12 +407,12 @@ class TC_GAME_API WorldBossAI : public ScriptedAI
virtual void ExecuteEvent(uint32 /*eventId*/) { }
void Reset() override { _Reset(); }
- void EnterCombat(Unit* /*who*/) override { _EnterCombat(); }
+ void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); }
void JustDied(Unit* /*killer*/) override { _JustDied(); }
protected:
void _Reset();
- void _EnterCombat();
+ void _JustEngagedWith();
void _JustDied();
EventMap events;
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index cdbfcd8fb19..0105c034395 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
index e1bf3af5343..687e352c7e6 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index 79c3c17d610..91786534cd2 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
index 6b5b06490f0..abf49355e1e 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
index b979051e948..7cb0fe722d7 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
index b9f9e0f26e0..97ee7f44bba 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AI/SelectableAI.h b/src/server/game/AI/SelectableAI.h
new file mode 100644
index 00000000000..9998bc22494
--- /dev/null
+++ b/src/server/game/AI/SelectableAI.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2017 TrinityCore
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+#ifndef SelectableAI_h__
+#define SelectableAI_h__
+
+#include "FactoryHolder.h"
+
+class DBPermit
+{
+ public:
+ virtual ~DBPermit() { }
+ virtual bool IsScriptNameAllowedInDB() const = 0;
+};
+
+template
+struct SelectableAI : public FactoryHolder, public Permissible, public DBPermit
+{
+ SelectableAI(std::string const& name) : FactoryHolder(name), Permissible(), DBPermit() { }
+
+ bool IsScriptNameAllowedInDB() const final override { return is_db_allowed; }
+};
+
+
+#endif // SelectableAI_h__
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 970b5718cd1..98105373c2d 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -73,6 +73,8 @@ SmartAI::SmartAI(Creature* c) : CreatureAI(c)
mJustReset = false;
mConditionsTimer = 0;
mHasConditions = sConditionMgr->HasConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, c->GetEntry());
+
+ _gossipReturn = false;
}
bool SmartAI::IsAIControlled() const
@@ -603,7 +605,7 @@ void SmartAI::JustReachedHome()
mJustReset = false;
}
-void SmartAI::EnterCombat(Unit* enemy)
+void SmartAI::JustEngagedWith(Unit* enemy)
{
if (IsAIControlled())
me->InterruptNonMeleeSpells(false); // must be before ProcessEvents
@@ -762,7 +764,7 @@ void SmartAI::SetData(uint32 id, uint32 value)
GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, nullptr, id, value);
}
-void SmartAI::SetGUID(ObjectGuid /*guid*/, int32 /*id*/) { }
+void SmartAI::SetGUID(ObjectGuid const& /*guid*/, int32 /*id*/) { }
ObjectGuid SmartAI::GetGUID(int32 /*id*/) const
{
@@ -797,14 +799,16 @@ void SmartAI::SetEvadeDisabled(bool disable)
bool SmartAI::GossipHello(Player* player)
{
+ _gossipReturn = false;
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player);
- return false;
+ return _gossipReturn;
}
bool SmartAI::GossipSelect(Player* player, uint32 menuId, uint32 gossipListId)
{
+ _gossipReturn = false;
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, menuId, gossipListId);
- return false;
+ return _gossipReturn;
}
bool SmartAI::GossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, const char* /*code*/)
@@ -975,9 +979,9 @@ void SmartGameObjectAI::Reset()
// Called when a player opens a gossip dialog with the gameobject.
bool SmartGameObjectAI::GossipHello(Player* player)
{
- TC_LOG_DEBUG("scripts.ai", "SmartGameObjectAI::GossipHello");
+ _gossipReturn = false;
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0, 0, false, nullptr, me);
- return false;
+ return _gossipReturn;
}
bool SmartGameObjectAI::OnReportUse(Player* player)
@@ -990,8 +994,9 @@ bool SmartGameObjectAI::OnReportUse(Player* player)
// Called when a player selects a gossip item in the gameobject's gossip menu.
bool SmartGameObjectAI::GossipSelect(Player* player, uint32 menuId, uint32 gossipListId)
{
+ _gossipReturn = false;
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, menuId, gossipListId, false, nullptr, me);
- return false;
+ return _gossipReturn;
}
// Called when a player selects a gossip with a code in the gameobject's gossip menu.
diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
index d8aa4164d03..eafba2df55c 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.h
+++ b/src/server/game/AI/SmartScripts/SmartAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -79,7 +79,7 @@ class TC_GAME_API SmartAI : public CreatureAI
void JustReachedHome() override;
// Called for reaction at enter to combat if not in combat yet (enemy can be nullptr)
- void EnterCombat(Unit* enemy) override;
+ void JustEngagedWith(Unit* enemy) override;
// Called for reaction at stopping attack at no attackers or targets
void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER) override;
@@ -154,7 +154,7 @@ class TC_GAME_API SmartAI : public CreatureAI
void SetData(uint32 id, uint32 value) override;
// Used in scripts to share variables
- void SetGUID(ObjectGuid guid, int32 id = 0) override;
+ void SetGUID(ObjectGuid const& guid, int32 id = 0) override;
// Used in scripts to share variables
ObjectGuid GetGUID(int32 id = 0) const override;
@@ -198,6 +198,8 @@ class TC_GAME_API SmartAI : public CreatureAI
void SetWPPauseTimer(uint32 time) { mWPPauseTimer = time; }
+ void SetGossipReturn(bool val) { _gossipReturn = val; }
+
private:
bool mIsCharmed;
uint32 mFollowCreditType;
@@ -240,12 +242,15 @@ class TC_GAME_API SmartAI : public CreatureAI
void CheckConditions(uint32 diff);
bool mHasConditions;
uint32 mConditionsTimer;
+
+ // Gossip
+ bool _gossipReturn;
};
class TC_GAME_API SmartGameObjectAI : public GameObjectAI
{
public:
- SmartGameObjectAI(GameObject* g) : GameObjectAI(g) { }
+ SmartGameObjectAI(GameObject* g) : GameObjectAI(g), _gossipReturn(false) { }
~SmartGameObjectAI() { }
void UpdateAI(uint32 diff) override;
@@ -268,8 +273,13 @@ class TC_GAME_API SmartGameObjectAI : public GameObjectAI
void EventInform(uint32 eventId) override;
void SpellHit(Unit* unit, const SpellInfo* spellInfo) override;
+ void SetGossipReturn(bool val) { _gossipReturn = val; }
+
private:
SmartScript mScript;
+
+ // Gossip
+ bool _gossipReturn;
};
/// Registers scripts required by the SAI scripting system
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index d3f57181165..866efa6c96f 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -1876,7 +1876,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
}
case SMART_ACTION_CROSS_CAST:
{
- ObjectList* casters = GetTargets(CreateEvent(SMART_EVENT_UPDATE_IC, 0, 0, 0, 0, 0, SMART_ACTION_NONE, 0, 0, 0, 0, 0, 0, (SMARTAI_TARGETS)e.action.crossCast.targetType, e.action.crossCast.targetParam1, e.action.crossCast.targetParam2, e.action.crossCast.targetParam3, 0), unit);
+ ObjectList* casters = GetTargets(CreateEvent(SMART_EVENT_UPDATE_IC, 0, 0, 0, 0, 0, 0, SMART_ACTION_NONE, 0, 0, 0, 0, 0, 0, (SMARTAI_TARGETS)e.action.crossCast.targetType, e.action.crossCast.targetParam1, e.action.crossCast.targetParam2, e.action.crossCast.targetParam3, 0), unit);
if (!casters)
break;
@@ -2215,7 +2215,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
}
case SMART_ACTION_SEND_GOSSIP_MENU:
{
- if (!GetBaseObject())
+ if (!GetBaseObject() || !IsSmart())
break;
TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_SEND_GOSSIP_MENU: gossipMenuId %d, gossipNpcTextId %d",
@@ -2225,6 +2225,12 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!targets)
break;
+ // override default gossip
+ if (me)
+ ENSURE_AI(SmartAI, me->AI())->SetGossipReturn(true);
+ else if (go)
+ ENSURE_AI(SmartGameObjectAI, go->AI())->SetGossipReturn(true);
+
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
{
if (Player* player = (*itr)->ToPlayer())
@@ -2694,18 +2700,18 @@ void SmartScript::InstallTemplate(SmartScriptHolder const& e)
{
case SMARTAI_TEMPLATE_CASTER:
{
- AddEvent(SMART_EVENT_UPDATE_IC, 0, 0, 0, e.action.installTtemplate.param2, e.action.installTtemplate.param3, SMART_ACTION_CAST, e.action.installTtemplate.param1, e.target.raw.param1, 0, 0, 0, 0, SMART_TARGET_VICTIM, 0, 0, 0, 1);
- AddEvent(SMART_EVENT_RANGE, 0, e.action.installTtemplate.param4, 300, 0, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
- AddEvent(SMART_EVENT_RANGE, 0, 0, e.action.installTtemplate.param4>10?e.action.installTtemplate.param4-10:0, 0, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 0, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
- AddEvent(SMART_EVENT_MANA_PCT, 0, e.action.installTtemplate.param5-15>100?100:e.action.installTtemplate.param5+15, 100, 1000, 1000, SMART_ACTION_SET_EVENT_PHASE, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
- AddEvent(SMART_EVENT_MANA_PCT, 0, 0, e.action.installTtemplate.param5, 1000, 1000, SMART_ACTION_SET_EVENT_PHASE, 0, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
- AddEvent(SMART_EVENT_MANA_PCT, 0, 0, e.action.installTtemplate.param5, 1000, 1000, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_UPDATE_IC, 0, 0, 0, e.action.installTtemplate.param2, e.action.installTtemplate.param3, 0, SMART_ACTION_CAST, e.action.installTtemplate.param1, e.target.raw.param1, 0, 0, 0, 0, SMART_TARGET_VICTIM, 0, 0, 0, 1);
+ AddEvent(SMART_EVENT_RANGE, 0, e.action.installTtemplate.param4, 300, 0, 0, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
+ AddEvent(SMART_EVENT_RANGE, 0, 0, e.action.installTtemplate.param4>10?e.action.installTtemplate.param4-10:0, 0, 0, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 0, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
+ AddEvent(SMART_EVENT_MANA_PCT, 0, e.action.installTtemplate.param5-15>100?100:e.action.installTtemplate.param5+15, 100, 1000, 1000, 0, SMART_ACTION_SET_EVENT_PHASE, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_MANA_PCT, 0, 0, e.action.installTtemplate.param5, 1000, 1000, 0, SMART_ACTION_SET_EVENT_PHASE, 0, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_MANA_PCT, 0, 0, e.action.installTtemplate.param5, 1000, 1000, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
break;
}
case SMARTAI_TEMPLATE_TURRET:
{
- AddEvent(SMART_EVENT_UPDATE_IC, 0, 0, 0, e.action.installTtemplate.param2, e.action.installTtemplate.param3, SMART_ACTION_CAST, e.action.installTtemplate.param1, e.target.raw.param1, 0, 0, 0, 0, SMART_TARGET_VICTIM, 0, 0, 0, 0);
- AddEvent(SMART_EVENT_JUST_CREATED, 0, 0, 0, 0, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 0, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_UPDATE_IC, 0, 0, 0, e.action.installTtemplate.param2, e.action.installTtemplate.param3, 0, SMART_ACTION_CAST, e.action.installTtemplate.param1, e.target.raw.param1, 0, 0, 0, 0, SMART_TARGET_VICTIM, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_JUST_CREATED, 0, 0, 0, 0, 0, 0, SMART_ACTION_ALLOW_COMBAT_MOVEMENT, 0, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
break;
}
case SMARTAI_TEMPLATE_CAGED_NPC_PART:
@@ -2713,22 +2719,22 @@ void SmartScript::InstallTemplate(SmartScriptHolder const& e)
if (!me)
return;
//store cage as id1
- AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, SMART_ACTION_STORE_TARGET_LIST, 1, 0, 0, 0, 0, 0, SMART_TARGET_CLOSEST_GAMEOBJECT, e.action.installTtemplate.param1, 10, 0, 0);
+ AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, 0, SMART_ACTION_STORE_TARGET_LIST, 1, 0, 0, 0, 0, 0, SMART_TARGET_CLOSEST_GAMEOBJECT, e.action.installTtemplate.param1, 10, 0, 0);
//reset(close) cage on hostage(me) respawn
- AddEvent(SMART_EVENT_UPDATE, SMART_EVENT_FLAG_NOT_REPEATABLE, 0, 0, 0, 0, SMART_ACTION_RESET_GOBJECT, 0, 0, 0, 0, 0, 0, SMART_TARGET_GAMEOBJECT_DISTANCE, e.action.installTtemplate.param1, 5, 0, 0);
+ AddEvent(SMART_EVENT_UPDATE, SMART_EVENT_FLAG_NOT_REPEATABLE, 0, 0, 0, 0, 0, SMART_ACTION_RESET_GOBJECT, 0, 0, 0, 0, 0, 0, SMART_TARGET_GAMEOBJECT_DISTANCE, e.action.installTtemplate.param1, 5, 0, 0);
- AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, SMART_ACTION_SET_RUN, e.action.installTtemplate.param3, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
- AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, SMART_ACTION_SET_EVENT_PHASE, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, 0, SMART_ACTION_SET_RUN, e.action.installTtemplate.param3, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, 0, SMART_ACTION_SET_EVENT_PHASE, 1, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
- AddEvent(SMART_EVENT_UPDATE, SMART_EVENT_FLAG_NOT_REPEATABLE, 1000, 1000, 0, 0, SMART_ACTION_MOVE_OFFSET, 0, 0, 0, 0, 0, 0, SMART_TARGET_SELF, 0, e.action.installTtemplate.param4, 0, 1);
+ AddEvent(SMART_EVENT_UPDATE, SMART_EVENT_FLAG_NOT_REPEATABLE, 1000, 1000, 0, 0, 0, SMART_ACTION_MOVE_OFFSET, 0, 0, 0, 0, 0, 0, SMART_TARGET_SELF, 0, e.action.installTtemplate.param4, 0, 1);
//phase 1: give quest credit on movepoint reached
- AddEvent(SMART_EVENT_MOVEMENTINFORM, 0, POINT_MOTION_TYPE, SMART_RANDOM_POINT, 0, 0, SMART_ACTION_SET_DATA, 0, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 1, 0, 0, 1);
+ AddEvent(SMART_EVENT_MOVEMENTINFORM, 0, POINT_MOTION_TYPE, SMART_RANDOM_POINT, 0, 0, 0, SMART_ACTION_SET_DATA, 0, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 1, 0, 0, 1);
//phase 1: despawn after time on movepoint reached
- AddEvent(SMART_EVENT_MOVEMENTINFORM, 0, POINT_MOTION_TYPE, SMART_RANDOM_POINT, 0, 0, SMART_ACTION_FORCE_DESPAWN, e.action.installTtemplate.param2, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
+ AddEvent(SMART_EVENT_MOVEMENTINFORM, 0, POINT_MOTION_TYPE, SMART_RANDOM_POINT, 0, 0, 0, SMART_ACTION_FORCE_DESPAWN, e.action.installTtemplate.param2, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
if (sCreatureTextMgr->TextExist(me->GetEntry(), (uint8)e.action.installTtemplate.param5))
- AddEvent(SMART_EVENT_MOVEMENTINFORM, 0, POINT_MOTION_TYPE, SMART_RANDOM_POINT, 0, 0, SMART_ACTION_TALK, e.action.installTtemplate.param5, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
+ AddEvent(SMART_EVENT_MOVEMENTINFORM, 0, POINT_MOTION_TYPE, SMART_RANDOM_POINT, 0, 0, 0, SMART_ACTION_TALK, e.action.installTtemplate.param5, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 1);
break;
}
case SMARTAI_TEMPLATE_CAGED_GO_PART:
@@ -2736,16 +2742,16 @@ void SmartScript::InstallTemplate(SmartScriptHolder const& e)
if (!go)
return;
//store hostage as id1
- AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, SMART_ACTION_STORE_TARGET_LIST, 1, 0, 0, 0, 0, 0, SMART_TARGET_CLOSEST_CREATURE, e.action.installTtemplate.param1, 10, 0, 0);
+ AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, 0, SMART_ACTION_STORE_TARGET_LIST, 1, 0, 0, 0, 0, 0, SMART_TARGET_CLOSEST_CREATURE, e.action.installTtemplate.param1, 10, 0, 0);
//store invoker as id2
- AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, SMART_ACTION_STORE_TARGET_LIST, 2, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
+ AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, 0, SMART_ACTION_STORE_TARGET_LIST, 2, 0, 0, 0, 0, 0, SMART_TARGET_NONE, 0, 0, 0, 0);
//signal hostage
- AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, SMART_ACTION_SET_DATA, 0, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 1, 0, 0, 0);
+ AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, 0, SMART_ACTION_SET_DATA, 0, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 1, 0, 0, 0);
//when hostage raeched end point, give credit to invoker
if (e.action.installTtemplate.param2)
- AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, SMART_ACTION_CALL_KILLEDMONSTER, e.action.installTtemplate.param1, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 2, 0, 0, 0);
+ AddEvent(SMART_EVENT_DATA_SET, 0, 0, 0, 0, 0, 0, SMART_ACTION_CALL_KILLEDMONSTER, e.action.installTtemplate.param1, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 2, 0, 0, 0);
else
- AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, SMART_ACTION_CALL_KILLEDMONSTER, e.action.installTtemplate.param1, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 2, 0, 0, 0);
+ AddEvent(SMART_EVENT_GO_LOOT_STATE_CHANGED, 0, GO_ACTIVATED, 0, 0, 0, 0, SMART_ACTION_CALL_KILLEDMONSTER, e.action.installTtemplate.param1, 0, 0, 0, 0, 0, SMART_TARGET_STORED, 2, 0, 0, 0);
break;
}
case SMARTAI_TEMPLATE_BASIC:
@@ -2754,12 +2760,12 @@ void SmartScript::InstallTemplate(SmartScriptHolder const& e)
}
}
-void SmartScript::AddEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask)
+void SmartScript::AddEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, uint32 event_param5, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask)
{
- mInstallEvents.push_back(CreateEvent(e, event_flags, event_param1, event_param2, event_param3, event_param4, action, action_param1, action_param2, action_param3, action_param4, action_param5, action_param6, t, target_param1, target_param2, target_param3, phaseMask));
+ mInstallEvents.push_back(CreateEvent(e, event_flags, event_param1, event_param2, event_param3, event_param4, event_param5, action, action_param1, action_param2, action_param3, action_param4, action_param5, action_param6, t, target_param1, target_param2, target_param3, phaseMask));
}
-SmartScriptHolder SmartScript::CreateEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask)
+SmartScriptHolder SmartScript::CreateEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, uint32 event_param5, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask)
{
SmartScriptHolder script;
script.event.type = e;
@@ -2767,6 +2773,7 @@ SmartScriptHolder SmartScript::CreateEvent(SMART_EVENT e, uint32 event_flags, ui
script.event.raw.param2 = event_param2;
script.event.raw.param3 = event_param3;
script.event.raw.param4 = event_param4;
+ script.event.raw.param5 = event_param5;
script.event.event_phase_mask = phaseMask;
script.event.event_flags = event_flags;
script.event.event_chance = 100;
diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h
index efc6c5d3de6..7bd6c23cb9b 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.h
+++ b/src/server/game/AI/SmartScripts/SmartScript.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -49,8 +49,8 @@ class TC_GAME_API SmartScript
ObjectList* GetTargets(SmartScriptHolder const& e, Unit* invoker = nullptr);
ObjectList* GetWorldObjectsInDist(float dist);
void InstallTemplate(SmartScriptHolder const& e);
- SmartScriptHolder CreateEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask = 0);
- void AddEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask = 0);
+ SmartScriptHolder CreateEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, uint32 event_param5, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask = 0);
+ void AddEvent(SMART_EVENT e, uint32 event_flags, uint32 event_param1, uint32 event_param2, uint32 event_param3, uint32 event_param4, uint32 event_param5, SMART_ACTION action, uint32 action_param1, uint32 action_param2, uint32 action_param3, uint32 action_param4, uint32 action_param5, uint32 action_param6, SMARTAI_TARGETS t, uint32 target_param1, uint32 target_param2, uint32 target_param3, uint32 phaseMask = 0);
void SetPathId(uint32 id) { mPathId = id; }
uint32 GetPathId() const { return mPathId; }
WorldObject* GetBaseObject()
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
index a23ad8870e5..f4da44901ff 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -264,23 +264,24 @@ void SmartAIMgr::LoadSmartAIFromDB()
temp.event.raw.param2 = fields[9].GetUInt32();
temp.event.raw.param3 = fields[10].GetUInt32();
temp.event.raw.param4 = fields[11].GetUInt32();
+ temp.event.raw.param5 = fields[12].GetUInt32();
- temp.action.type = (SMART_ACTION)fields[12].GetUInt8();
- temp.action.raw.param1 = fields[13].GetUInt32();
- temp.action.raw.param2 = fields[14].GetUInt32();
- temp.action.raw.param3 = fields[15].GetUInt32();
- temp.action.raw.param4 = fields[16].GetUInt32();
- temp.action.raw.param5 = fields[17].GetUInt32();
- temp.action.raw.param6 = fields[18].GetUInt32();
+ temp.action.type = (SMART_ACTION)fields[13].GetUInt8();
+ temp.action.raw.param1 = fields[14].GetUInt32();
+ temp.action.raw.param2 = fields[15].GetUInt32();
+ temp.action.raw.param3 = fields[16].GetUInt32();
+ temp.action.raw.param4 = fields[17].GetUInt32();
+ temp.action.raw.param5 = fields[18].GetUInt32();
+ temp.action.raw.param6 = fields[19].GetUInt32();
- temp.target.type = (SMARTAI_TARGETS)fields[19].GetUInt8();
- temp.target.raw.param1 = fields[20].GetUInt32();
- temp.target.raw.param2 = fields[21].GetUInt32();
- temp.target.raw.param3 = fields[22].GetUInt32();
- temp.target.x = fields[23].GetFloat();
- temp.target.y = fields[24].GetFloat();
- temp.target.z = fields[25].GetFloat();
- temp.target.o = fields[26].GetFloat();
+ temp.target.type = (SMARTAI_TARGETS)fields[20].GetUInt8();
+ temp.target.raw.param1 = fields[21].GetUInt32();
+ temp.target.raw.param2 = fields[22].GetUInt32();
+ temp.target.raw.param3 = fields[23].GetUInt32();
+ temp.target.x = fields[24].GetFloat();
+ temp.target.y = fields[25].GetFloat();
+ temp.target.z = fields[26].GetFloat();
+ temp.target.o = fields[27].GetFloat();
//check target
if (!IsTargetValid(temp))
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
index 9e4dfc1a8bb..9778f824f67 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -448,6 +448,7 @@ struct SmartEvent
uint32 param2;
uint32 param3;
uint32 param4;
+ uint32 param5;
} raw;
};
};
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index cd4ccc415a5..edc29652ff2 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index deb473bc974..0a6f6b4c028 100644
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Accounts/BattlenetAccountMgr.cpp b/src/server/game/Accounts/BattlenetAccountMgr.cpp
index a8d83d5390f..54058624df0 100644
--- a/src/server/game/Accounts/BattlenetAccountMgr.cpp
+++ b/src/server/game/Accounts/BattlenetAccountMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Accounts/BattlenetAccountMgr.h b/src/server/game/Accounts/BattlenetAccountMgr.h
index 7bcbcc4bb8c..f41f46bd2f8 100644
--- a/src/server/game/Accounts/BattlenetAccountMgr.h
+++ b/src/server/game/Accounts/BattlenetAccountMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Accounts/RBAC.cpp b/src/server/game/Accounts/RBAC.cpp
index 951223a9257..8c9f01acfee 100644
--- a/src/server/game/Accounts/RBAC.cpp
+++ b/src/server/game/Accounts/RBAC.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index c4b49321796..4d0bdfc6a30 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -765,7 +765,11 @@ enum RBACPermissions
RBAC_PERM_COMMAND_NPC_SHOWLOOT = 865,
RBAC_PERM_COMMAND_LIST_SPAWNPOINTS = 866,
RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING_LOCALE = 867,
-
+ RBAC_PERM_COMMAND_MODIFY_POWER = 868, // reserved
+ RBAC_PERM_COMMAND_DEBUG_SEND_PLAYER_CHOICE = 869, // reserved
+ //
+ // IF YOU ADD NEW PERMISSIONS, ADD THEM IN MASTER BRANCH AS WELL!
+ //
// custom permissions 1000+
RBAC_PERM_MAX
};
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 689e37076b2..652a36c9bd1 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index 553f61ca344..29965c6676f 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index 7371cfb5f4f..3d199cef2c8 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 9b829288ab6..dd8b960a480 100644
--- a/src/server/game/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index b5b0c3b3357..29f2bd64231 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 1e54a6edb1b..abee3772327 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp
index 5643465212b..65c976550e2 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouseBot/AuctionHouseBot.h
index 11e5aa177ff..53165663a43 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
index 8396ab94622..1abf495a467 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h
index ba4326ffabf..c6616dcb096 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
index d0d7cd3fd89..149a3e77377 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h
index fe6fda33d48..a284c3e11f4 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 92ac296cd67..a703c70d30d 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index fc4ffd05c0b..b04d6e28377 100644
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp
index 3825201ef22..88564ed12c5 100644
--- a/src/server/game/Battlefield/BattlefieldMgr.cpp
+++ b/src/server/game/Battlefield/BattlefieldMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/BattlefieldMgr.h b/src/server/game/Battlefield/BattlefieldMgr.h
index dc9d50f6ed3..ec8fe41b7b4 100644
--- a/src/server/game/Battlefield/BattlefieldMgr.h
+++ b/src/server/game/Battlefield/BattlefieldMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/Zones/BattlefieldTB.cpp b/src/server/game/Battlefield/Zones/BattlefieldTB.cpp
index 0bd2cf4d2e4..a2f2d772398 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldTB.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldTB.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/Zones/BattlefieldTB.h b/src/server/game/Battlefield/Zones/BattlefieldTB.h
index dbdacf64487..16e276543d8 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldTB.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldTB.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 2e33b665cbc..b7ad251c0ae 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
index 7921ef1ab73..38b7ca44f6c 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp
index 5a860db8ded..a739507d4b2 100644
--- a/src/server/game/Battlegrounds/Arena.cpp
+++ b/src/server/game/Battlegrounds/Arena.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Arena.h b/src/server/game/Battlegrounds/Arena.h
index 7242a5ba031..dc4dc662bd2 100644
--- a/src/server/game/Battlegrounds/Arena.h
+++ b/src/server/game/Battlegrounds/Arena.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/ArenaScore.h b/src/server/game/Battlegrounds/ArenaScore.h
index 763841e2215..805b41e1ef2 100644
--- a/src/server/game/Battlegrounds/ArenaScore.h
+++ b/src/server/game/Battlegrounds/ArenaScore.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp
index f95e2a8958c..bd8141bed42 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeam.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h
index d4b1088577b..efc9109cef4 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.h
+++ b/src/server/game/Battlegrounds/ArenaTeam.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
index 74fbb2a0fa8..349b00cd487 100644
--- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.h b/src/server/game/Battlegrounds/ArenaTeamMgr.h
index fc658542ed3..052b8f5e511 100644
--- a/src/server/game/Battlegrounds/ArenaTeamMgr.h
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 03298abe71a..f79aeec0761 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index 1e42700942b..382b775c9a4 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
index 32288ae0fea..182218af93c 100644
--- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h
index fcfb662a4ad..5adb3675c40 100644
--- a/src/server/game/Battlegrounds/BattlegroundMgr.h
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
index 991319fb1c7..f5596b94cc4 100644
--- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h
index 0ae959cea85..41b7916ddab 100644
--- a/src/server/game/Battlegrounds/BattlegroundQueue.h
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h
index 8b401cbe605..b90a06c6cc6 100644
--- a/src/server/game/Battlegrounds/BattlegroundScore.h
+++ b/src/server/game/Battlegrounds/BattlegroundScore.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
index c3836a3330b..c9669271da5 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
index b60d4d03e77..7587f3fda83 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
index 40bef0af095..30ca2f94a66 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
index 52accb57447..6e54a5b3ede 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
index 21e041fafe1..dbdc0cc86c4 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h
index c7a9a37e593..018389e92a5 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
index 19868190c83..bb02e671123 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
index 0dc77c03012..e72a1ee841b 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
index e4940add01c..027f2ee4484 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
index f55c8fedd01..c5727f67ddc 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
index 5003f74a5a5..b7a72e26f9d 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
index d2300704b11..100d4560804 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
index 3c9904e62c9..6db5c73a4f4 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
index 9dcd606c455..bab8035788c 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
index d4380b043d7..0186b1e8e73 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h
index 60c32a253dc..b860e83c569 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
index be508ee3c9a..a240bb8eab3 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h
index 2f20265e074..c122b1c56ee 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
index 35fb94b3cc3..54e84dd8a73 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
index e72ca010868..d6657873507 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
index c536e171a87..a52235a7230 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
index ec940f7d780..7d72a697f70 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
index 38f73630a21..c50019a6867 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
index 1a9d83fffad..cbb06e33717 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
index d98686a0891..94f8094fe60 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
index 5ae782d304a..589179047b7 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index e643602ec1f..7f7f6853773 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp
index 49bc58745d5..da119fc6cba 100644
--- a/src/server/game/Cache/CharacterCache.cpp
+++ b/src/server/game/Cache/CharacterCache.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Cache/CharacterCache.h b/src/server/game/Cache/CharacterCache.h
index 641339b730d..ed3239410c4 100644
--- a/src/server/game/Cache/CharacterCache.h
+++ b/src/server/game/Cache/CharacterCache.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp
index 710d0c624b9..570ad2afe5e 100644
--- a/src/server/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h
index 75acb501961..80ad3b28e5a 100644
--- a/src/server/game/Calendar/CalendarMgr.h
+++ b/src/server/game/Calendar/CalendarMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index 10ef7a03986..036074d49ef 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index 299e664d713..113803fd479 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Chat/Channels/ChannelAppenders.h b/src/server/game/Chat/Channels/ChannelAppenders.h
index 03daf416f30..6de6bb24c0a 100644
--- a/src/server/game/Chat/Channels/ChannelAppenders.h
+++ b/src/server/game/Chat/Channels/ChannelAppenders.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index 4502913a164..dbb3a32b048 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index ff1c7d6fd31..3133d78ec8b 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index e532f338457..0c4deab3b3f 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 8b8e15b813b..7b6cb6ebe91 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
index bc924177933..b7cf6cff200 100644
--- a/src/server/game/Chat/ChatLink.cpp
+++ b/src/server/game/Chat/ChatLink.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
index 2fd36fa1b65..e8d53f2396c 100644
--- a/src/server/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp
index 54b02c6a97e..eea3e0f8d18 100644
--- a/src/server/game/Combat/HostileRefManager.cpp
+++ b/src/server/game/Combat/HostileRefManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
index 3d42bfd9b33..585d96b7443 100644
--- a/src/server/game/Combat/HostileRefManager.h
+++ b/src/server/game/Combat/HostileRefManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 2bf8132a407..8d7b015fa70 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index e17a6926ffd..95230f335b5 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h
index 35b7e7ecb5f..e5b89dabc44 100644
--- a/src/server/game/Combat/UnitEvents.h
+++ b/src/server/game/Combat/UnitEvents.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 60a894dddea..9f2a16f3a90 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 64b0e4dd914..af15d3947ce 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
index c121cb2c15e..80665bf781f 100644
--- a/src/server/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h
index c7172b2ec23..04a77c8c3ae 100644
--- a/src/server/game/Conditions/DisableMgr.h
+++ b/src/server/game/Conditions/DisableMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp
index 4571ecd5ef6..a47b10ae5f9 100644
--- a/src/server/game/DataStores/DB2Stores.cpp
+++ b/src/server/game/DataStores/DB2Stores.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/DB2Stores.h b/src/server/game/DataStores/DB2Stores.h
index f18313b1df3..3a56e7c133a 100644
--- a/src/server/game/DataStores/DB2Stores.h
+++ b/src/server/game/DataStores/DB2Stores.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index c75f491b259..78faddb7d13 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/DB2Utility.cpp b/src/server/game/DataStores/DB2Utility.cpp
index d2a2ae93270..8b411382a5b 100644
--- a/src/server/game/DataStores/DB2Utility.cpp
+++ b/src/server/game/DataStores/DB2Utility.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/DB2Utility.h b/src/server/game/DataStores/DB2Utility.h
index fb072733e51..d02cd5af075 100644
--- a/src/server/game/DataStores/DB2Utility.h
+++ b/src/server/game/DataStores/DB2Utility.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/DB2fmt.h b/src/server/game/DataStores/DB2fmt.h
index 2a93220066c..f4c52ef8105 100644
--- a/src/server/game/DataStores/DB2fmt.h
+++ b/src/server/game/DataStores/DB2fmt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 5e5b9da5cc8..21f2a4a5d68 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 821cacebae9..e71768912fe 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index 0e2e32e5522..05833b05528 100644
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index f7636bbdb60..952cb2767b8 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -2574,17 +2574,15 @@ struct VehicleSeatEntry
uint32 m_flagsB; // 45
// 46-57 added in 3.1, floats mostly
- bool CanEnterOrExit() const
- {
- return ((m_flags & VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT) != 0 ||
- //If it has anmation for enter/ride, means it can be entered/exited by logic
- (m_flags & (VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_ENTER | VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_RIDE)) != 0);
- }
- bool CanSwitchFromSeat() const { return (m_flags & VEHICLE_SEAT_FLAG_CAN_SWITCH) != 0; }
- bool IsUsableByOverride() const { return (m_flags & (VEHICLE_SEAT_FLAG_UNCONTROLLED | VEHICLE_SEAT_FLAG_UNK18)
- || (m_flagsB & (VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 |
- VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3 | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4))); }
- bool IsEjectable() const { return (m_flagsB & VEHICLE_SEAT_FLAG_B_EJECTABLE) != 0; }
+ inline bool HasFlag(VehicleSeatFlags flag) const { return !!(m_flags & flag); }
+ inline bool HasFlag(VehicleSeatFlagsB flag) const { return !!(m_flagsB & flag); }
+
+ inline bool CanEnterOrExit() const { return HasFlag(VehicleSeatFlags(VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT | VEHICLE_SEAT_FLAG_CAN_CONTROL | VEHICLE_SEAT_FLAG_SHOULD_USE_VEH_SEAT_EXIT_ANIM_ON_VOLUNTARY_EXIT)); }
+ inline bool CanSwitchFromSeat() const { return HasFlag(VEHICLE_SEAT_FLAG_CAN_SWITCH); }
+ inline bool IsUsableByOverride() const { return HasFlag(VehicleSeatFlags(VEHICLE_SEAT_FLAG_UNCONTROLLED | VEHICLE_SEAT_FLAG_UNK18))
+ || HasFlag(VehicleSeatFlagsB(VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 |
+ VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3 | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4)); }
+ inline bool IsEjectable() const { return HasFlag(VEHICLE_SEAT_FLAG_B_EJECTABLE); }
};
struct WMOAreaTableEntry
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 7fd82ed1f98..b782b104b3b 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp
index 3c8e62d9765..2812b0dd748 100644
--- a/src/server/game/DataStores/M2Stores.cpp
+++ b/src/server/game/DataStores/M2Stores.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/M2Stores.h b/src/server/game/DataStores/M2Stores.h
index b0948d227af..bcd16cf7cfe 100644
--- a/src/server/game/DataStores/M2Stores.h
+++ b/src/server/game/DataStores/M2Stores.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DataStores/M2Structure.h b/src/server/game/DataStores/M2Structure.h
index 9c01408f440..269c1f3acda 100644
--- a/src/server/game/DataStores/M2Structure.h
+++ b/src/server/game/DataStores/M2Structure.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp
index 497db7fd749..2c8da3941bf 100644
--- a/src/server/game/DungeonFinding/LFG.cpp
+++ b/src/server/game/DungeonFinding/LFG.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
index 638f625813e..dadcf20c8c7 100644
--- a/src/server/game/DungeonFinding/LFG.h
+++ b/src/server/game/DungeonFinding/LFG.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp
index b0df03c0b10..cb4dcb8a1e4 100644
--- a/src/server/game/DungeonFinding/LFGGroupData.cpp
+++ b/src/server/game/DungeonFinding/LFGGroupData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGGroupData.h b/src/server/game/DungeonFinding/LFGGroupData.h
index 4f21c1f263f..ddc3f7fbe76 100644
--- a/src/server/game/DungeonFinding/LFGGroupData.h
+++ b/src/server/game/DungeonFinding/LFGGroupData.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 5554b42fc7f..4399bb766e1 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 95522d47ae1..b4685965646 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp
index f55315ef5a3..d32a3d3430c 100644
--- a/src/server/game/DungeonFinding/LFGPlayerData.cpp
+++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h
index 356a0bb3152..deb689ebc69 100644
--- a/src/server/game/DungeonFinding/LFGPlayerData.h
+++ b/src/server/game/DungeonFinding/LFGPlayerData.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp
index 459dd4a1fb6..bf8ea5d342f 100644
--- a/src/server/game/DungeonFinding/LFGQueue.cpp
+++ b/src/server/game/DungeonFinding/LFGQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h
index e24cbb80c6f..86a036e367c 100644
--- a/src/server/game/DungeonFinding/LFGQueue.h
+++ b/src/server/game/DungeonFinding/LFGQueue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
index 0286444a2a6..0f88dd29d75 100644
--- a/src/server/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/DungeonFinding/LFGScripts.h b/src/server/game/DungeonFinding/LFGScripts.h
index 761f2d8fa06..0cc037ac4e8 100644
--- a/src/server/game/DungeonFinding/LFGScripts.h
+++ b/src/server/game/DungeonFinding/LFGScripts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
index 7700cd0b64b..e362e1d5557 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
+++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.h b/src/server/game/Entities/AreaTrigger/AreaTrigger.h
index 4a1c6031bfc..4b63c7a7cd4 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTrigger.h
+++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index 2337bc4b57e..f7be38c88ea 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index c7768e2f920..72cac1255fc 100644
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index ff68dda6179..832b29db25c 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -591,13 +591,17 @@ void Creature::Update(uint32 diff)
if (m_shouldReacquireTarget && !IsFocusing(nullptr, true))
{
SetTarget(m_suppressedTarget);
- if (m_suppressedTarget)
+
+ if (!HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN))
{
- if (WorldObject const* objTarget = ObjectAccessor::GetWorldObject(*this, m_suppressedTarget))
- SetFacingToObject(objTarget, false);
+ if (m_suppressedTarget)
+ {
+ if (WorldObject const* objTarget = ObjectAccessor::GetWorldObject(*this, m_suppressedTarget))
+ SetFacingToObject(objTarget, false);
+ }
+ else
+ SetFacingTo(m_suppressedOrientation, false);
}
- else
- SetFacingTo(m_suppressedOrientation, false);
m_shouldReacquireTarget = false;
}
@@ -2789,15 +2793,19 @@ void Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target)
}
}
- bool const canTurnDuringCast = !spellInfo->HasAttribute(SPELL_ATTR5_DONT_TURN_DURING_CAST);
- // Face the target - we need to do this before the unit state is modified for no-turn spells
- if (target)
- SetFacingToObject(target, false);
- else if (!canTurnDuringCast)
- if (Unit* victim = GetVictim())
- SetFacingToObject(victim, false); // ensure orientation is correct at beginning of cast
+ bool const noTurnDuringCast = spellInfo->HasAttribute(SPELL_ATTR5_DONT_TURN_DURING_CAST);
+
+ if (!HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN))
+ {
+ // Face the target - we need to do this before the unit state is modified for no-turn spells
+ if (target)
+ SetFacingToObject(target, false);
+ else if (noTurnDuringCast)
+ if (Unit* victim = GetVictim())
+ SetFacingToObject(victim, false); // ensure orientation is correct at beginning of cast
+ }
- if (!canTurnDuringCast)
+ if (noTurnDuringCast)
AddUnitState(UNIT_STATE_CANNOT_TURN);
}
@@ -2835,7 +2843,7 @@ void Creature::ReleaseFocus(Spell const* focusSpell, bool withDelay)
if (focusSpell && focusSpell != m_focusSpell)
return;
- if (IsPet()) // player pets do not use delay system
+ if (IsPet() && !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN)) // player pets do not use delay system
{
SetGuidValue(UNIT_FIELD_TARGET, m_suppressedTarget);
if (m_suppressedTarget)
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 9b05f110b97..ea27e28a9a9 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 87b22012a88..7c16538e334 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
index 0b06d4bb145..41dff797181 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index d257978ba70..4d0df8b3b7d 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index da94463f652..91b95dff407 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index 0b4a81d455d..b6cfb855f1a 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
index b98533849e5..40d2ffc090c 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.h
+++ b/src/server/game/Entities/Creature/TemporarySummon.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
index 458672227f6..dee0038150d 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h
index 48ce2179649..1f748fef062 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.h
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 7f31215a4d2..3da93a3553a 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index fb533d176d5..c2076a13acf 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ struct GameObjectTemplate
std::string castBarCaption;
std::string unk1;
float size;
- int32 unkInt32;
+ int32 RequiredLevel;
union // different GO types have different data field
{
//0 GAMEOBJECT_TYPE_DOOR
diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
index 513610a5dd8..89fc7ed910f 100644
--- a/src/server/game/Entities/Item/Container/Bag.cpp
+++ b/src/server/game/Entities/Item/Container/Bag.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h
index 9278bb16930..867c0998820 100644
--- a/src/server/game/Entities/Item/Container/Bag.h
+++ b/src/server/game/Entities/Item/Container/Bag.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 679b644aecb..5843903e610 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h
index a29531f236a..124125b9348 100644
--- a/src/server/game/Entities/Item/Item.h
+++ b/src/server/game/Entities/Item/Item.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index 3fe8b4086ab..84794b0aa4b 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h
index da727a72ab4..54bd78d863d 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.h
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp
index 8ee2a464f5b..14b7f286c6a 100644
--- a/src/server/game/Entities/Item/ItemTemplate.cpp
+++ b/src/server/game/Entities/Item/ItemTemplate.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index 780307663e5..6a723a26008 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 340c0675aff..66a9a642fbc 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index de64babcd18..a2e8e276d48 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
index 8c2735502b4..e8455f6b1b1 100644
--- a/src/server/game/Entities/Object/ObjectDefines.h
+++ b/src/server/game/Entities/Object/ObjectDefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/ObjectGuid.cpp b/src/server/game/Entities/Object/ObjectGuid.cpp
index 972bae79394..dd25eab42de 100644
--- a/src/server/game/Entities/Object/ObjectGuid.cpp
+++ b/src/server/game/Entities/Object/ObjectGuid.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h
index ba93f603990..0482fd5d0b2 100644
--- a/src/server/game/Entities/Object/ObjectGuid.h
+++ b/src/server/game/Entities/Object/ObjectGuid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp
index bfb3022a2b7..22c3dc9916f 100644
--- a/src/server/game/Entities/Object/ObjectPosSelector.cpp
+++ b/src/server/game/Entities/Object/ObjectPosSelector.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h
index d5414e0e245..231978b6180 100644
--- a/src/server/game/Entities/Object/ObjectPosSelector.h
+++ b/src/server/game/Entities/Object/ObjectPosSelector.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index c9e6ea6eee8..e9feaded99b 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h
index 46c8d4874ec..eb1a2ea1bbe 100644
--- a/src/server/game/Entities/Object/Position.h
+++ b/src/server/game/Entities/Object/Position.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp
index bab870de275..c2da619aa64 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
index 5d9a5c0de81..bbc42b84146 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp
index c14926d4a52..e732faf1f3e 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
index 122d00e2fd6..32f03e15df3 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
index 7d67269cb0c..d79d0448799 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h
index 18e26cd7552..50de0a8b5b7 100644
--- a/src/server/game/Entities/Object/Updates/UpdateMask.h
+++ b/src/server/game/Entities/Object/Updates/UpdateMask.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 7dbcced435d..f841946b71e 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -1196,7 +1196,7 @@ void Pet::_LoadAuras(uint32 timediff)
}
// negative effects should continue counting down after logout
- if (remaintime != -1 && !spellInfo->IsPositive())
+ if (remaintime != -1 && (!spellInfo->IsPositive() || spellInfo->HasAttribute(SPELL_ATTR4_FADES_WHILE_LOGGED_OUT)))
{
if (remaintime/IN_MILLISECONDS <= int32(timediff))
continue;
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index 522d7d47085..45796d57934 100644
--- a/src/server/game/Entities/Pet/Pet.h
+++ b/src/server/game/Entities/Pet/Pet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h
index 4d1f6ab0d72..dd359dc6ee4 100644
--- a/src/server/game/Entities/Pet/PetDefines.h
+++ b/src/server/game/Entities/Pet/PetDefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Player/CinematicMgr.cpp b/src/server/game/Entities/Player/CinematicMgr.cpp
index 95a4a08a333..58b2dee9883 100644
--- a/src/server/game/Entities/Player/CinematicMgr.cpp
+++ b/src/server/game/Entities/Player/CinematicMgr.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Player/CinematicMgr.h b/src/server/game/Entities/Player/CinematicMgr.h
index f1a333311b9..e141a50e818 100644
--- a/src/server/game/Entities/Player/CinematicMgr.h
+++ b/src/server/game/Entities/Player/CinematicMgr.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp
index 773319728eb..0c9228d7012 100644
--- a/src/server/game/Entities/Player/KillRewarder.cpp
+++ b/src/server/game/Entities/Player/KillRewarder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Player/KillRewarder.h b/src/server/game/Entities/Player/KillRewarder.h
index a67014a2403..42e7fee56ac 100644
--- a/src/server/game/Entities/Player/KillRewarder.h
+++ b/src/server/game/Entities/Player/KillRewarder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 042a9dce206..e096c0302d5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -8556,10 +8556,32 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
if (guid.IsGameObject())
{
GameObject* go = GetMap()->GetGameObject(guid);
+ auto shouldLootRelease = [this](GameObject* go, LootType lootType) -> bool
+ {
+ // not check distance for GO in case owned GO (fishing bobber case, for example)
+ // And permit out of range GO with no owner in case fishing hole
+ if (!go)
+ return true;
- // not check distance for GO in case owned GO (fishing bobber case, for example)
- // And permit out of range GO with no owner in case fishing hole
- if (!go || (loot_type != LOOT_FISHINGHOLE && ((loot_type != LOOT_FISHING && loot_type != LOOT_FISHING_JUNK) || go->GetOwnerGUID() != GetGUID()) && !go->IsWithinDistInMap(this, INTERACTION_DISTANCE)) || (loot_type == LOOT_CORPSE && go->GetRespawnTime() && go->isSpawnedByDefault()))
+ if (lootType == LOOT_SKINNING)
+ {
+ // Disarm Trap
+ if (!go->IsWithinDistInMap(this, 20.f))
+ return true;
+ }
+ else
+ {
+ if (lootType != LOOT_FISHINGHOLE && ((lootType != LOOT_FISHING && lootType != LOOT_FISHING_JUNK) || go->GetOwnerGUID() != GetGUID()) && !go->IsWithinDistInMap(this, INTERACTION_DISTANCE))
+ return true;
+
+ if (lootType == LOOT_CORPSE && go->GetRespawnTime() && go->isSpawnedByDefault())
+ return true;
+ }
+
+ return false;
+ };
+
+ if (shouldLootRelease(go, loot_type))
{
SendLootRelease(guid);
return;
@@ -10874,14 +10896,19 @@ InventoryResult Player::CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &des
return EQUIP_ERR_BAG_IN_BAG;
// search free slot
- res = CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot);
+ uint8 searchSlotStart = INVENTORY_SLOT_ITEM_START;
+ // new bags can be directly equipped
+ if (!pItem && pProto->Class == ITEM_CLASS_CONTAINER && pProto->SubClass == ITEM_SUBCLASS_CONTAINER &&
+ (pProto->Bonding == NO_BIND || pProto->Bonding == BIND_WHEN_PICKED_UP))
+ searchSlotStart = INVENTORY_SLOT_BAG_START;
+
+ res = CanStoreItem_InInventorySlots(searchSlotStart, INVENTORY_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot);
if (res != EQUIP_ERR_OK)
{
if (no_space_count)
*no_space_count = count + no_similar_count;
return res;
}
-
if (count == 0)
{
if (no_similar_count == 0)
@@ -18023,7 +18050,7 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff)
}
// negative effects should continue counting down after logout
- if (remaintime != -1 && !spellInfo->IsPositive())
+ if (remaintime != -1 && ((!spellInfo->IsPositive() && spellInfo->Id != 15007) || spellInfo->HasAttribute(SPELL_ATTR4_FADES_WHILE_LOGGED_OUT))) // Resurrection sickness should not fade while logged out
{
if (remaintime/IN_MILLISECONDS <= int32(timediff))
continue;
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 84bb34e7a7d..8394cdfead2 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index 7273002fea4..59e2d890b58 100644
--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index b8482ecc9f0..4f47bbe6314 100644
--- a/src/server/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Player/TradeData.cpp b/src/server/game/Entities/Player/TradeData.cpp
index be7c80788e2..bce76f69308 100644
--- a/src/server/game/Entities/Player/TradeData.cpp
+++ b/src/server/game/Entities/Player/TradeData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Player/TradeData.h b/src/server/game/Entities/Player/TradeData.h
index 642a360416d..915d786e0c2 100644
--- a/src/server/game/Entities/Player/TradeData.h
+++ b/src/server/game/Entities/Player/TradeData.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp
index 14a0ca1f193..3c14fea8b33 100644
--- a/src/server/game/Entities/Totem/Totem.cpp
+++ b/src/server/game/Entities/Totem/Totem.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h
index 8a0edb19430..4a096f16a9d 100644
--- a/src/server/game/Entities/Totem/Totem.h
+++ b/src/server/game/Entities/Totem/Totem.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index 4aedd04716d..ba0524c2140 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
index 95fd6c191a2..03bd3bcb2c7 100644
--- a/src/server/game/Entities/Transport/Transport.h
+++ b/src/server/game/Entities/Transport/Transport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index f01b613e2b7..f26cf8a5ef2 100644
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 68bbadd9142..f6d6b047aaf 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -883,7 +883,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam
if (damagetype != NODAMAGE && damage)
{
if (victim != this && victim->GetTypeId() == TYPEID_PLAYER && // does not support creature push_back
- (!spellProto || !spellProto->HasAttribute(SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE)))
+ (!spellProto || !(spellProto->HasAttribute(SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE) || spellProto->HasAttribute(SPELL_ATTR3_TREAT_AS_PERIODIC))))
{
if (damagetype != DOT)
if (Spell* spell = victim->m_currentSpells[CURRENT_GENERIC_SPELL])
@@ -1962,7 +1962,7 @@ void Unit::AttackerStateUpdate(Unit* victim, WeaponAttackType attType, bool extr
if (attType != BASE_ATTACK && attType != OFF_ATTACK)
return; // ignore ranged case
- if (GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED))
+ if (GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN))
SetFacingToObject(victim, false); // update client side facing to face the target (prevents visual glitches when casting untargeted spells)
// melee attack spell cast at main hand attack only - no normal melee dmg dealt
@@ -2010,7 +2010,7 @@ void Unit::FakeAttackerStateUpdate(Unit* victim, WeaponAttackType attType /*= BA
if (attType != BASE_ATTACK && attType != OFF_ATTACK)
return; // ignore ranged case
- if (GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED))
+ if (GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN))
SetFacingToObject(victim, false); // update client side facing to face the target (prevents visual glitches when casting untargeted spells)
CalcDamageInfo damageInfo;
@@ -3000,13 +3000,14 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi
if (GetTypeId() == TYPEID_PLAYER)
ToPlayer()->SendAutoRepeatCancel(this);
+ m_currentSpells[spellType] = nullptr;
+
if (spell->getState() != SPELL_STATE_FINISHED)
spell->cancel();
if (GetTypeId() == TYPEID_UNIT && IsAIEnabled)
ToCreature()->AI()->OnSpellCastInterrupt(spell->GetSpellInfo());
- m_currentSpells[spellType] = NULL;
spell->SetReferencedFromCurrent(false);
}
}
@@ -4074,9 +4075,10 @@ void Unit::RemoveArenaAuras()
RemoveAppliedAuras([](AuraApplication const* aurApp)
{
Aura const* aura = aurApp->GetBase();
- return !aura->GetSpellInfo()->HasAttribute(SPELL_ATTR4_UNK21) // don't remove stances, shadowform, pally/hunter auras
- && !aura->IsPassive() // don't remove passive auras
- && (aurApp->IsPositive() || !aura->GetSpellInfo()->HasAttribute(SPELL_ATTR3_DEATH_PERSISTENT)); // not negative death persistent auras
+ return (!aura->GetSpellInfo()->HasAttribute(SPELL_ATTR4_UNK21) // don't remove stances, shadowform, pally/hunter auras
+ && !aura->IsPassive() // don't remove passive auras
+ && (aurApp->IsPositive() || !aura->GetSpellInfo()->HasAttribute(SPELL_ATTR3_DEATH_PERSISTENT))) || // not negative death persistent auras
+ aura->GetSpellInfo()->HasAttribute(SPELL_ATTR5_REMOVE_ON_ARENA_ENTER); // special marker, always remove
});
}
@@ -6576,7 +6578,7 @@ float Unit::SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, Damage
return 1.0f;
// Some spells don't benefit from pct done mods
- if (spellProto->HasAttribute(SPELL_ATTR6_NO_DONE_PCT_DAMAGE_MODS))
+ if (spellProto->HasAttribute(SPELL_ATTR6_LIMIT_PCT_DAMAGE_MODS))
return 1.0f;
// For totems pct done mods are calculated when its calculation is run on the player in SpellDamageBonusDone.
@@ -7778,7 +7780,7 @@ uint32 Unit::MeleeDamageBonusDone(Unit* victim, uint32 pdamage, WeaponAttackType
float DoneTotalMod = 1.0f;
// Some spells don't benefit from pct done mods
- if (spellProto && !spellProto->HasAttribute(SPELL_ATTR6_NO_DONE_PCT_DAMAGE_MODS))
+ if (spellProto && !spellProto->HasAttribute(SPELL_ATTR6_LIMIT_PCT_DAMAGE_MODS))
{
// mods for SPELL_SCHOOL_MASK_NORMAL are already factored in base melee damage calculation
if (!(spellProto->GetSchoolMask() & SPELL_SCHOOL_MASK_NORMAL))
@@ -8266,7 +8268,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
if (enemy)
{
if (IsAIEnabled)
- creature->AI()->EnterCombat(enemy);
+ creature->AI()->JustEngagedWith(enemy);
if (creature->GetFormation())
creature->GetFormation()->MemberAttackStart(creature, enemy);
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index be9a8412869..408fb5743c1 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index f9b4d827585..e39aef40ceb 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
index 08f3e7f8f1a..2b0022637bd 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.h
+++ b/src/server/game/Entities/Vehicle/Vehicle.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h
index 298d5b48324..9e4b90beb41 100644
--- a/src/server/game/Entities/Vehicle/VehicleDefines.h
+++ b/src/server/game/Entities/Vehicle/VehicleDefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 9fe5f21671b..72790a87a8e 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 77b1a8c4f4f..de1f09dc241 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index 576c86c94b2..1fbe8c99247 100644
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index ef40af9e537..fcebdac8efc 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 2059d4d29c8..c57deb6290e 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -854,16 +854,23 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
const_cast(cInfo)->maxgold = cInfo->mingold;
}
- if (cInfo->AIName == "TotemAI" || cInfo->AIName == "PetAI")
+ if (!cInfo->AIName.empty())
{
- TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has not-allowed `AIName` '%s' set, removing", cInfo->Entry, cInfo->AIName.c_str());
- const_cast(cInfo)->AIName.clear();
- }
-
- if (!cInfo->AIName.empty() && !sCreatureAIRegistry->HasItem(cInfo->AIName))
- {
- TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has non-registered `AIName` '%s' set, removing", cInfo->Entry, cInfo->AIName.c_str());
- const_cast(cInfo)->AIName.clear();
+ auto registryItem = sCreatureAIRegistry->GetRegistryItem(cInfo->AIName);
+ if (!registryItem)
+ {
+ TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has non-registered `AIName` '%s' set, removing", cInfo->Entry, cInfo->AIName.c_str());
+ const_cast(cInfo)->AIName.clear();
+ }
+ else
+ {
+ DBPermit const* permit = dynamic_cast(registryItem);
+ if (!ASSERT_NOTNULL(permit)->IsScriptNameAllowedInDB())
+ {
+ TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has not-allowed `AIName` '%s' set, removing", cInfo->Entry, cInfo->AIName.c_str());
+ const_cast(cInfo)->AIName.clear();
+ }
+ }
}
FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction);
@@ -6905,7 +6912,7 @@ void ObjectMgr::LoadGameObjectTemplate()
// 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
"Data13, Data14, Data15, Data16, Data17, Data18, Data19, Data20, Data21, Data22, Data23, Data24, Data25, Data26, Data27, Data28, "
// 37 38 39 40 41 42
- "Data29, Data30, Data31, unkInt32, AIName, ScriptName "
+ "Data29, Data30, Data31, RequiredLevel, AIName, ScriptName "
"FROM gameobject_template");
if (!result)
@@ -6936,7 +6943,7 @@ void ObjectMgr::LoadGameObjectTemplate()
for (uint8 i = 0; i < MAX_GAMEOBJECT_DATA; ++i)
got.raw.data[i] = fields[8 + i].GetUInt32();
- got.unkInt32 = fields[40].GetInt32();
+ got.RequiredLevel = fields[40].GetInt32();
got.AIName = fields[41].GetString();
got.ScriptId = GetScriptId(fields[42].GetCString());
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 307e5b9d11f..3c16a08136b 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index 9d28ac86bd6..14b37db9f28 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
index 481469f5849..5d8f960e38e 100644
--- a/src/server/game/Grids/Cells/CellImpl.h
+++ b/src/server/game/Grids/Cells/CellImpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index 9bdaedc0fba..b4188b57b31 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 2c07facca9d..356efece2d4 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
index 06bda25d423..81bfc7c27b3 100644
--- a/src/server/game/Grids/GridLoader.h
+++ b/src/server/game/Grids/GridLoader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
index e3fda52b3f2..9afd611ceb3 100644
--- a/src/server/game/Grids/GridRefManager.h
+++ b/src/server/game/Grids/GridRefManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index 69d17b4d8ce..be8463325ca 100644
--- a/src/server/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp
index 2d00c9db184..9f54aa505a2 100644
--- a/src/server/game/Grids/GridStates.cpp
+++ b/src/server/game/Grids/GridStates.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/GridStates.h b/src/server/game/Grids/GridStates.h
index 364407cbb54..5f2237718d3 100644
--- a/src/server/game/Grids/GridStates.h
+++ b/src/server/game/Grids/GridStates.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 986f083c053..ec5f7942cae 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
index d0fd14fa53e..3ff20024d37 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index baf23052ea7..0de5aeb84e4 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index 0ea65a2cbaf..9f29511fc19 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index 83bad9c8e23..f8b14bec41d 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index c83a6e7a2d1..d20627f3cb7 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 944c53b9428..d3a7d216879 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 56aaf3ba5cc..c5228cf0625 100644
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp
index 1d0714bdf3e..371928fb5bb 100644
--- a/src/server/game/Groups/GroupMgr.cpp
+++ b/src/server/game/Groups/GroupMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h
index 3cd5d080b04..47b463ac34e 100644
--- a/src/server/game/Groups/GroupMgr.h
+++ b/src/server/game/Groups/GroupMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
index abab0c19688..03ab969d90b 100644
--- a/src/server/game/Groups/GroupRefManager.h
+++ b/src/server/game/Groups/GroupRefManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp
index b56354d3977..5ee7aefac4e 100644
--- a/src/server/game/Groups/GroupReference.cpp
+++ b/src/server/game/Groups/GroupReference.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
index 649f229b086..8c7acfc58fc 100644
--- a/src/server/game/Groups/GroupReference.h
+++ b/src/server/game/Groups/GroupReference.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 5d17e690320..e8027ed709b 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index 624b5e5fa7b..3115864b6e1 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp
index 8962d76651f..b6df2a89ebc 100644
--- a/src/server/game/Guilds/GuildFinderMgr.cpp
+++ b/src/server/game/Guilds/GuildFinderMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h
index 427582c5f59..dd4db89799b 100644
--- a/src/server/game/Guilds/GuildFinderMgr.h
+++ b/src/server/game/Guilds/GuildFinderMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index 8f06119a8d9..98aab76838c 100644
--- a/src/server/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
index db030cb88d4..bcf229e9ce5 100644
--- a/src/server/game/Guilds/GuildMgr.h
+++ b/src/server/game/Guilds/GuildMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp
index cb25f7bceeb..9e19dcb3edc 100644
--- a/src/server/game/Handlers/AddonHandler.cpp
+++ b/src/server/game/Handlers/AddonHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h
index f75958182fa..a6288f7deab 100644
--- a/src/server/game/Handlers/AddonHandler.h
+++ b/src/server/game/Handlers/AddonHandler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp
index 5e48262bda0..9cfbf0b7935 100644
--- a/src/server/game/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Handlers/ArenaTeamHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
index 43e81eb8b3d..e43018b55c4 100644
--- a/src/server/game/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp
index 1da730d6276..cc880a1822e 100644
--- a/src/server/game/Handlers/AuthHandler.cpp
+++ b/src/server/game/Handlers/AuthHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index da1f3f4f88c..ba68a63ce93 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/BattlefieldHandler.cpp b/src/server/game/Handlers/BattlefieldHandler.cpp
index 5f3edd3d334..be88002b822 100644
--- a/src/server/game/Handlers/BattlefieldHandler.cpp
+++ b/src/server/game/Handlers/BattlefieldHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
index 9d47a2071a8..9658cdcf964 100644
--- a/src/server/game/Handlers/CalendarHandler.cpp
+++ b/src/server/game/Handlers/CalendarHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp
index 1d0bb107164..ab056bddb5b 100644
--- a/src/server/game/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Handlers/ChannelHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index ef5d2e70a71..0e9d1a8ead8 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index cc29ae6de59..c0296a79118 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp
index 894f6233c6b..375e1b1afa6 100644
--- a/src/server/game/Handlers/CombatHandler.cpp
+++ b/src/server/game/Handlers/CombatHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp
index 52513106e77..77b38db670b 100644
--- a/src/server/game/Handlers/DuelHandler.cpp
+++ b/src/server/game/Handlers/DuelHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index 1dc2ef55a82..688f100e408 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/GuildFinderHandler.cpp b/src/server/game/Handlers/GuildFinderHandler.cpp
index 0d9b973fe71..03e42e30768 100644
--- a/src/server/game/Handlers/GuildFinderHandler.cpp
+++ b/src/server/game/Handlers/GuildFinderHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp
index dee85e9acf7..09570641b1b 100644
--- a/src/server/game/Handlers/GuildHandler.cpp
+++ b/src/server/game/Handlers/GuildHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index c8200718759..fd1ed97765c 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp
index d5bf09bdbeb..1349c1aeb18 100644
--- a/src/server/game/Handlers/LFGHandler.cpp
+++ b/src/server/game/Handlers/LFGHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
index f993dc060b7..b2ba6877456 100644
--- a/src/server/game/Handlers/LootHandler.cpp
+++ b/src/server/game/Handlers/LootHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp
index 378d57ae6fd..ac2154396bb 100644
--- a/src/server/game/Handlers/MailHandler.cpp
+++ b/src/server/game/Handlers/MailHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 1689b8efea8..b7b0c0dede4 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 6960d202463..354a3376fdf 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
index b4d5583c0c4..41bbeea9550 100644
--- a/src/server/game/Handlers/NPCHandler.cpp
+++ b/src/server/game/Handlers/NPCHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h
index a1c49079c54..163eeebc1c9 100644
--- a/src/server/game/Handlers/NPCHandler.h
+++ b/src/server/game/Handlers/NPCHandler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index 48fbbc6c716..3592ec07e49 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp
index 4d75ecc0e98..05153d7b69e 100644
--- a/src/server/game/Handlers/PetitionsHandler.cpp
+++ b/src/server/game/Handlers/PetitionsHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
index 2018815b0e6..50737883200 100644
--- a/src/server/game/Handlers/QueryHandler.cpp
+++ b/src/server/game/Handlers/QueryHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -211,9 +211,7 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket& recvData)
data << info->unk1; // 2.0.3, string
data.append(info->raw.data, MAX_GAMEOBJECT_DATA);
data << float(info->size); // go size
-
- data << int32(info->unkInt32); // 4.x, unknown
-
+ data << int32(info->RequiredLevel); // 4.x, Required level
GameObjectQuestItemList const* items = sObjectMgr->GetGameObjectQuestItemList(entry);
if (items)
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 61e59a33449..0cccae34dfe 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp
index a10744929dd..d4dd308eecd 100644
--- a/src/server/game/Handlers/ReferAFriendHandler.cpp
+++ b/src/server/game/Handlers/ReferAFriendHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp
index d5d220eb65b..1ebfcef96c7 100644
--- a/src/server/game/Handlers/SkillHandler.cpp
+++ b/src/server/game/Handlers/SkillHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/SocialHandler.cpp b/src/server/game/Handlers/SocialHandler.cpp
index be31907cc95..29bdf795e36 100644
--- a/src/server/game/Handlers/SocialHandler.cpp
+++ b/src/server/game/Handlers/SocialHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index fcfce3ee5a1..003fae78917 100644
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
index 761413b276d..4ece77add28 100644
--- a/src/server/game/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Handlers/TaxiHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp
index a49371c6ca5..7df32606b7f 100644
--- a/src/server/game/Handlers/TicketHandler.cpp
+++ b/src/server/game/Handlers/TicketHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp
index 859b85551dd..5763b92de9c 100644
--- a/src/server/game/Handlers/TradeHandler.cpp
+++ b/src/server/game/Handlers/TradeHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp
index 93ec5c50b61..5abc4164155 100644
--- a/src/server/game/Handlers/VehicleHandler.cpp
+++ b/src/server/game/Handlers/VehicleHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp
index 138320f8dec..378eab0eab0 100644
--- a/src/server/game/Handlers/VoiceChatHandler.cpp
+++ b/src/server/game/Handlers/VoiceChatHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Handlers/VoidStorageHandler.cpp b/src/server/game/Handlers/VoidStorageHandler.cpp
index a735547e71c..0813bc173c6 100644
--- a/src/server/game/Handlers/VoidStorageHandler.cpp
+++ b/src/server/game/Handlers/VoidStorageHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index 71a70f1347c..7f173225fb9 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 6d3728e4fc5..1697413ae04 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index bce1c51b176..3a38c41bfae 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h
index 085a9694fc6..d882c92f544 100644
--- a/src/server/game/Instances/InstanceScript.h
+++ b/src/server/game/Instances/InstanceScript.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
index c83c3ddf9f2..689d7c12df6 100644
--- a/src/server/game/Loot/LootMgr.cpp
+++ b/src/server/game/Loot/LootMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index 4cf2e58934e..e4e66cd4167 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp
index fe642aae1e6..ede5b5c5eb3 100644
--- a/src/server/game/Mails/Mail.cpp
+++ b/src/server/game/Mails/Mail.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h
index 0f80844a142..5f74d5e7173 100644
--- a/src/server/game/Mails/Mail.h
+++ b/src/server/game/Mails/Mail.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/AreaBoundary.cpp b/src/server/game/Maps/AreaBoundary.cpp
index 6ed21ec50f6..a6e0071b310 100644
--- a/src/server/game/Maps/AreaBoundary.cpp
+++ b/src/server/game/Maps/AreaBoundary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Maps/AreaBoundary.h b/src/server/game/Maps/AreaBoundary.h
index dab73e9b51b..2805ef10160 100644
--- a/src/server/game/Maps/AreaBoundary.h
+++ b/src/server/game/Maps/AreaBoundary.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index c98519a7272..22a7bc098df 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index e8071c9e02d..d42cb18a6ee 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index d54e758e581..e1169c22d2b 100644
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h
index 2394aa2035a..dccb6cee9a1 100644
--- a/src/server/game/Maps/MapInstanced.h
+++ b/src/server/game/Maps/MapInstanced.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 5299dcf6463..a3bf5179a61 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 44185170452..ca75b7382f3 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
index 52f7bddfcb6..92b2135201f 100644
--- a/src/server/game/Maps/MapRefManager.h
+++ b/src/server/game/Maps/MapRefManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
index 946c650d611..f0bb4ec7f99 100644
--- a/src/server/game/Maps/MapReference.h
+++ b/src/server/game/Maps/MapReference.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp
index d3743fdcac8..44b22c85294 100644
--- a/src/server/game/Maps/MapScripts.cpp
+++ b/src/server/game/Maps/MapScripts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 8bc8c120ce5..2a69168ccfc 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index 682e5407ad3..1c4888a2a19 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp
index 63543ad1e38..cd3bdb5902c 100644
--- a/src/server/game/Maps/TransportMgr.cpp
+++ b/src/server/game/Maps/TransportMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h
index 4e2840c8d21..4038d213b38 100644
--- a/src/server/game/Maps/TransportMgr.h
+++ b/src/server/game/Maps/TransportMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h
index 75fb56e555c..26633cf33cd 100644
--- a/src/server/game/Maps/ZoneScript.h
+++ b/src/server/game/Maps/ZoneScript.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h
index a4473cab808..48078b9610b 100644
--- a/src/server/game/Miscellaneous/Formulas.h
+++ b/src/server/game/Miscellaneous/Formulas.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index 41b350ab4c3..88a00419c57 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 7637969526a..1d83a13e8de 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -475,7 +475,7 @@ enum SpellAttr4
{
SPELL_ATTR4_IGNORE_RESISTANCES = 0x00000001, // 0 spells with this attribute will completely ignore the target's resistance (these spells can't be resisted)
SPELL_ATTR4_PROC_ONLY_ON_CASTER = 0x00000002, // 1 proc only on effects with TARGET_UNIT_CASTER?
- SPELL_ATTR4_UNK2 = 0x00000004, // 2
+ SPELL_ATTR4_FADES_WHILE_LOGGED_OUT = 0x00000004, // 2 duration is removed from aura while player is logged out
SPELL_ATTR4_UNK3 = 0x00000008, // 3
SPELL_ATTR4_UNK4 = 0x00000010, // 4 This will no longer cause guards to attack on use??
SPELL_ATTR4_UNK5 = 0x00000020, // 5
@@ -496,7 +496,7 @@ enum SpellAttr4
SPELL_ATTR4_NOT_CHECK_SELFCAST_POWER = 0x00100000, // 20 supersedes message "More powerful spell applied" for self casts.
SPELL_ATTR4_UNK21 = 0x00200000, // 21 Pally aura, dk presence, dudu form, warrior stance, shadowform, hunter track
SPELL_ATTR4_UNK22 = 0x00400000, // 22 Seal of Command (42058, 57770) and Gymer's Smash 55426
- SPELL_ATTR4_UNK23 = 0x00800000, // 23
+ SPELL_ATTR4_CANT_TRIGGER_ITEM_SPELLS = 0x00800000, // 23 spells with this flag should not trigger item spells / enchants (mostly in conjunction with SPELL_ATTR0_STOP_ATTACK_TARGET)
SPELL_ATTR4_UNK24 = 0x01000000, // 24 some shoot spell
SPELL_ATTR4_IS_PET_SCALING = 0x02000000, // 25 pet scaling auras
SPELL_ATTR4_CAST_ONLY_IN_OUTLAND = 0x04000000, // 26 Can only be used in Outland.
@@ -511,7 +511,7 @@ enum SpellAttr5
{
SPELL_ATTR5_CAN_CHANNEL_WHEN_MOVING = 0x00000001, // 0 available casting channel spell when moving
SPELL_ATTR5_NO_REAGENT_WHILE_PREP = 0x00000002, // 1 not need reagents if UNIT_FLAG_PREPARATION
- SPELL_ATTR5_UNK2 = 0x00000004, // 2
+ SPELL_ATTR5_REMOVE_ON_ARENA_ENTER = 0x00000004, // 2 remove this aura on arena enter
SPELL_ATTR5_USABLE_WHILE_STUNNED = 0x00000008, // 3 usable while stunned
SPELL_ATTR5_UNK4 = 0x00000010, // 4
SPELL_ATTR5_SINGLE_TARGET_SPELL = 0x00000020, // 5 Only one target can be apply at a time
@@ -535,7 +535,7 @@ enum SpellAttr5
SPELL_ATTR5_UNK23 = 0x00800000, // 23
SPELL_ATTR5_UNK24 = 0x01000000, // 24
SPELL_ATTR5_UNK25 = 0x02000000, // 25
- SPELL_ATTR5_UNK26 = 0x04000000, // 26 aoe related - Boulder, Cannon, Corpse Explosion, Fire Nova, Flames, Frost Bomb, Living Bomb, Seed of Corruption, Starfall, Thunder Clap, Volley
+ SPELL_ATTR5_SKIP_CHECKCAST_LOS_CHECK = 0x04000000, // 26 aoe related - Boulder, Cannon, Corpse Explosion, Fire Nova, Flames, Frost Bomb, Living Bomb, Seed of Corruption, Starfall, Thunder Clap, Volley
SPELL_ATTR5_DONT_SHOW_AURA_IF_SELF_CAST = 0x08000000, // 27 Auras with this attribute are not visible on units that are the caster
SPELL_ATTR5_DONT_SHOW_AURA_IF_NOT_SELF_CAST = 0x10000000, // 28 Auras with this attribute are not visible on units that are not the caster
SPELL_ATTR5_UNK29 = 0x20000000, // 29
@@ -550,7 +550,7 @@ enum SpellAttr6
SPELL_ATTR6_IGNORE_CASTER_AURAS = 0x00000004, // 2
SPELL_ATTR6_ASSIST_IGNORE_IMMUNE_FLAG = 0x00000008, // 3 skips checking UNIT_FLAG_IMMUNE_TO_PC and UNIT_FLAG_IMMUNE_TO_NPC flags on assist
SPELL_ATTR6_UNK4 = 0x00000010, // 4
- SPELL_ATTR6_UNK5 = 0x00000020, // 5
+ SPELL_ATTR6_DONT_CONSUME_PROC_CHARGES = 0x00000020, // 5 dont consume proc charges
SPELL_ATTR6_USE_SPELL_CAST_EVENT = 0x00000040, // 6 Auras with this attribute trigger SPELL_CAST combat log event instead of SPELL_AURA_START (clientside attribute)
SPELL_ATTR6_UNK7 = 0x00000080, // 7
SPELL_ATTR6_CANT_TARGET_CROWD_CONTROLLED = 0x00000100, // 8
@@ -572,9 +572,9 @@ enum SpellAttr6
SPELL_ATTR6_CAN_TARGET_UNTARGETABLE = 0x01000000, // 24
SPELL_ATTR6_NOT_RESET_SWING_IF_INSTANT = 0x02000000, // 25 Exorcism, Flash of Light
SPELL_ATTR6_UNK26 = 0x04000000, // 26 related to player castable positive buff
- SPELL_ATTR6_UNK27 = 0x08000000, // 27
+ SPELL_ATTR6_LIMIT_PCT_HEALING_MODS = 0x08000000, // 27 some custom rules - complicated
SPELL_ATTR6_UNK28 = 0x10000000, // 28 Death Grip
- SPELL_ATTR6_NO_DONE_PCT_DAMAGE_MODS = 0x20000000, // 29 ignores done percent damage mods?
+ SPELL_ATTR6_LIMIT_PCT_DAMAGE_MODS = 0x20000000, // 29 ignores done percent damage mods? some custom rules - complicated
SPELL_ATTR6_UNK30 = 0x40000000, // 30
SPELL_ATTR6_IGNORE_CATEGORY_COOLDOWN_MODS = 0x80000000 // 31 Spells with this attribute skip applying modifiers to category cooldowns
};
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index 80ea59a7837..53ed9acf6c9 100644
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp
index 69482ba7f50..9921b9bb5ee 100644
--- a/src/server/game/Movement/FollowerReference.cpp
+++ b/src/server/game/Movement/FollowerReference.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index 0da6a6ea772..c7af0f13649 100644
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index ddf87fdda67..0a0a0a90399 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index b8ae7af8299..8d4242923f2 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp
index eb2c1312d04..8f2a8f1fe95 100644
--- a/src/server/game/Movement/MovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index 8f75e3a2361..e35fc772511 100755
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h
index 3488de8534a..86c17d4dbfe 100644
--- a/src/server/game/Movement/MovementGeneratorImpl.h
+++ b/src/server/game/Movement/MovementGeneratorImpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
index 48524d9c663..1c8e66e8c24 100755
--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
index 95ba375de27..f5d5bf62fae 100755
--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
index 600aae8f8b3..8fdbd03ec86 100644
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
index e75240929db..d33ec358da5 100755
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
index 6bd2ba9377b..e17a63a6968 100644
--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
index 4674f99b3de..b1a6064c0ed 100644
--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
index 95909561882..86c99cb0601 100644
--- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
index 076ecd9130d..f282af1dfc4 100755
--- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
index 5414ed96f68..fdab55e29a0 100755
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
index 0cdaf51ed07..8fe3d7cbe24 100644
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
index a68a9dab63f..d2379f806a6 100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
index 9a4f22f60e8..0f943966d0c 100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp
index 356da2fb1a3..3d075d0bb35 100644
--- a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.h b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.h
index eaf79934928..27460375f3b 100644
--- a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
index b310eec2b42..f5e603e25d6 100755
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -61,9 +61,10 @@ bool TargetedMovementGenerator::DoUpdate(T* owner, uint32 diff)
{
_timer.Reset(100);
- float distance = owner->GetCombatReach() + sWorld->getRate(RATE_TARGET_POS_RECALCULATION_RANGE);
+ // the allowed distance between target and mover before the mover needs to reposition in order to keep attacking
+ float distance = GetMaxDistanceBeforeRepositioning(owner);
if (owner->IsPet() && (owner->GetCharmerOrOwnerGUID() == GetTarget()->GetGUID()))
- distance = 1.f; // pet following owner
+ distance = 1.f + GetTarget()->GetCombatReach(); // pet following owner
G3D::Vector3 destination = owner->movespline->FinalDestination();
if (owner->movespline->onTransport)
@@ -72,9 +73,9 @@ bool TargetedMovementGenerator::DoUpdate(T* owner, uint32 diff)
// First check distance
if (owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature()->CanFly())
- targetMoved = !GetTarget()->IsWithinDist3d(destination.x, destination.y, destination.z, distance);
+ targetMoved = !GetTarget()->IsInDist(destination.x, destination.y, destination.z, distance);
else
- targetMoved = !GetTarget()->IsWithinDist2d(destination.x, destination.y, distance);
+ targetMoved = !GetTarget()->IsInDist2d(destination.x, destination.y, distance);
// then, if the target is in range, check also Line of Sight.
if (!targetMoved)
@@ -265,6 +266,15 @@ void ChaseMovementGenerator::ReachTarget(T* owner)
template
void ChaseMovementGenerator::MovementInform(T*) { }
+template
+float ChaseMovementGenerator::GetMaxDistanceBeforeRepositioning(T* owner)
+{
+ // the notion of melee range and melee attack is clearly separated from the notion of the movement.
+ // As a seperation of concern refactoring, this value should be passed into parameter by the caller (during creation of ChaseMoveGen) instead of defining it
+ // here (or a callback should be used since this value depends on dynamic fields (combat reach).
+ return owner->GetMeleeRange(TargetedMovementGeneratorBase::GetTarget());
+}
+
template<>
void ChaseMovementGenerator::MovementInform(Creature* owner)
{
@@ -348,6 +358,12 @@ bool FollowMovementGenerator::EnableWalking() const
template
void FollowMovementGenerator::MovementInform(T*) { }
+template
+float FollowMovementGenerator::GetMaxDistanceBeforeRepositioning(T* owner)
+{
+ return owner->GetCombatReach() + TargetedMovementGeneratorBase::GetTarget()->GetCombatReach() + MOVE_FOLLOW_REPOSITIONING_DISTANCE;
+}
+
template<>
void FollowMovementGenerator::MovementInform(Creature* unit)
{
@@ -383,6 +399,8 @@ template bool ChaseMovementGenerator::HasLostTarget(Creature*) const;
template void ChaseMovementGenerator::ReachTarget(Player*);
template void ChaseMovementGenerator::ReachTarget(Creature*);
template void ChaseMovementGenerator::MovementInform(Player*);
+template float ChaseMovementGenerator::GetMaxDistanceBeforeRepositioning(Player*);
+template float ChaseMovementGenerator::GetMaxDistanceBeforeRepositioning(Creature*);
template void FollowMovementGenerator::DoInitialize(Player*);
template void FollowMovementGenerator::DoInitialize(Creature*);
@@ -397,3 +415,5 @@ template void FollowMovementGenerator::AddUnitStateMove(Creature*);
template void FollowMovementGenerator::ReachTarget(Player*);
template void FollowMovementGenerator::ReachTarget(Creature*);
template void FollowMovementGenerator::MovementInform(Player*);
+template float FollowMovementGenerator::GetMaxDistanceBeforeRepositioning(Player*);
+template float FollowMovementGenerator::GetMaxDistanceBeforeRepositioning(Creature*);
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
index 4842ee234b5..106c6aef97f 100755
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
#include "FollowerReference.h"
#include "Timer.h"
+#define MOVE_FOLLOW_REPOSITIONING_DISTANCE 1.5f
+
class TargetedMovementGeneratorBase
{
public:
@@ -55,6 +57,7 @@ class TargetedMovementGenerator : public MovementGeneratorMedium< T, D >, public
virtual void ReachTarget(T*) { }
virtual bool EnableWalking() const { return false; }
virtual void MovementInform(T*) { }
+ virtual float GetMaxDistanceBeforeRepositioning(T*) { return 0.0f; }
bool IsReachable() const;
void SetTargetLocation(T* owner, bool updateDestination);
@@ -86,6 +89,7 @@ class ChaseMovementGenerator : public TargetedMovementGenerator
@@ -106,6 +110,7 @@ class FollowMovementGenerator : public TargetedMovementGenerator
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index e398c5e5e35..a684248fd39 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp
index fe7780a76ba..ea2655c5244 100644
--- a/src/server/game/Movement/MovementStructures.cpp
+++ b/src/server/game/Movement/MovementStructures.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index 4a354e269df..ed6ac363f6e 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp
index 51083ab19a1..694c350b81b 100644
--- a/src/server/game/Movement/PathGenerator.cpp
+++ b/src/server/game/Movement/PathGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h
index 27d4fb0edd7..3e02e51785d 100644
--- a/src/server/game/Movement/PathGenerator.h
+++ b/src/server/game/Movement/PathGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp
index bf85ac838d9..574b11aabbb 100644
--- a/src/server/game/Movement/Spline/MoveSpline.cpp
+++ b/src/server/game/Movement/Spline/MoveSpline.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h
index d9c6c8fb321..f28f8a38e08 100644
--- a/src/server/game/Movement/Spline/MoveSpline.h
+++ b/src/server/game/Movement/Spline/MoveSpline.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
index f68b652aa9f..633eaab3ea4 100644
--- a/src/server/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/server/game/Movement/Spline/MoveSplineFlag.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
index c23f1d942cc..309a9e5b3d8 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
index 18982a1d70c..47ca8e131e3 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.h
+++ b/src/server/game/Movement/Spline/MoveSplineInit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
index f4e143fa118..c331e1c84d3 100644
--- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h
+++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
index 0fde31c95ab..381b41026f9 100644
--- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h
index 973ade335bb..ec3ff91b6c4 100644
--- a/src/server/game/Movement/Spline/MovementPacketBuilder.h
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h
index 93469656819..7a574b9dd45 100644
--- a/src/server/game/Movement/Spline/MovementTypedefs.h
+++ b/src/server/game/Movement/Spline/MovementTypedefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp
index a28a5edaa3f..0e2d3fb5682 100644
--- a/src/server/game/Movement/Spline/MovementUtil.cpp
+++ b/src/server/game/Movement/Spline/MovementUtil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp
index 1120d58cb98..4bc44072db7 100644
--- a/src/server/game/Movement/Spline/Spline.cpp
+++ b/src/server/game/Movement/Spline/Spline.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h
index 962516f5183..e1155c68860 100644
--- a/src/server/game/Movement/Spline/Spline.h
+++ b/src/server/game/Movement/Spline/Spline.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Spline/SplineChain.h b/src/server/game/Movement/Spline/SplineChain.h
index cb9afe62c38..1190487bedb 100644
--- a/src/server/game/Movement/Spline/SplineChain.h
+++ b/src/server/game/Movement/Spline/SplineChain.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Movement/Spline/SplineImpl.h b/src/server/game/Movement/Spline/SplineImpl.h
index 7444de07572..3e0cdf2430d 100644
--- a/src/server/game/Movement/Spline/SplineImpl.h
+++ b/src/server/game/Movement/Spline/SplineImpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index 76c6228d302..c83684763f5 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
index 43aba15e514..418b5c3aa4c 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.h
+++ b/src/server/game/Movement/Waypoints/WaypointManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index 211575acadb..75fba9bc2c6 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
index 893336fdb9c..91764d9b08b 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index a1de152d9ae..c37213d04e8 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index e69d9482edd..5fe26e43e88 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 4f28e34a734..c03fa8ef5e5 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -320,36 +320,27 @@ void PoolGroup::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 trig
// roll objects to be spawned
if (!ExplicitlyChanced.empty())
{
- while (count && ExplicitlyChanced.size() > rolledObjects.size())
- {
- --count;
- float roll = (float)rand_chance();
+ float roll = (float)rand_chance();
- for (PoolObject& obj : ExplicitlyChanced)
+ for (PoolObject& obj : ExplicitlyChanced)
+ {
+ roll -= obj.chance;
+ // Triggering object is marked as spawned at this time and can be also rolled (respawn case)
+ // so this need explicit check for this case
+ if (roll < 0 && (obj.guid == triggerFrom || !spawns.IsActiveObject(obj.guid)))
{
- roll -= obj.chance;
- // Triggering object is marked as spawned at this time and can be also rolled (respawn case)
- // so this need explicit check for this case
- if (roll < 0 && (obj.guid == triggerFrom || !spawns.IsActiveObject(obj.guid)))
- {
- rolledObjects.push_back(obj);
- break;
- }
+ rolledObjects.push_back(obj);
+ break;
}
}
}
- else if (!EqualChanced.empty())
- {
- rolledObjects = EqualChanced;
- for (auto itr = rolledObjects.begin(); itr != rolledObjects.end();)
+ if (!EqualChanced.empty() && rolledObjects.empty())
+ {
+ std::copy_if(EqualChanced.begin(), EqualChanced.end(), std::back_inserter(rolledObjects), [triggerFrom, &spawns](PoolObject const& object)
{
- // remove most of the active objects so there is higher chance inactive ones are spawned
- if (spawns.IsActiveObject(itr->guid) && urand(1, 4) != 1)
- itr = rolledObjects.erase(itr);
- else
- ++itr;
- }
+ return object.guid == triggerFrom || !spawns.IsActiveObject(object.guid);
+ });
Trinity::Containers::RandomResize(rolledObjects, count);
}
@@ -357,9 +348,6 @@ void PoolGroup::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 trig
// try to spawn rolled objects
for (PoolObject& obj : rolledObjects)
{
- if (spawns.IsActiveObject(obj.guid))
- continue;
-
if (obj.guid == triggerFrom)
{
ReSpawn1Object(&obj);
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
index 4382a285d4e..2de769cb98c 100644
--- a/src/server/game/Pools/PoolMgr.h
+++ b/src/server/game/Pools/PoolMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index b16e5fa8ad4..bc8549bcb60 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 783ca79e75d..7480db7bc44 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp
index a029201b6ab..4eec4876623 100644
--- a/src/server/game/Reputation/ReputationMgr.cpp
+++ b/src/server/game/Reputation/ReputationMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 675d1879d8e..fc5d42e10fb 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 96eb4555a9a..d63cc74b925 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 226a2adacc9..a725b9bb21c 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp
index 18b910420b1..d1ece831345 100644
--- a/src/server/game/Scripting/ScriptReloadMgr.cpp
+++ b/src/server/game/Scripting/ScriptReloadMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Scripting/ScriptReloadMgr.h b/src/server/game/Scripting/ScriptReloadMgr.h
index 3c1629415da..ecddda92719 100644
--- a/src/server/game/Scripting/ScriptReloadMgr.h
+++ b/src/server/game/Scripting/ScriptReloadMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index a310d4d6ee0..154526e212c 100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 38480cb2592..1182283921d 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006 - 2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/BattlenetServerManager.cpp b/src/server/game/Server/BattlenetServerManager.cpp
index 6357885f8bf..e42a822285e 100644
--- a/src/server/game/Server/BattlenetServerManager.cpp
+++ b/src/server/game/Server/BattlenetServerManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Server/BattlenetServerManager.h b/src/server/game/Server/BattlenetServerManager.h
index b7dee66c9b3..92ce9326177 100644
--- a/src/server/game/Server/BattlenetServerManager.h
+++ b/src/server/game/Server/BattlenetServerManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index b291011c2d4..d080b86d2a5 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index dc4ded65206..76720e870d4 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp
index 856649a9be3..f2e538075da 100644
--- a/src/server/game/Server/Protocol/PacketLog.cpp
+++ b/src/server/game/Server/Protocol/PacketLog.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Server/Protocol/PacketLog.h b/src/server/game/Server/Protocol/PacketLog.h
index e6082940197..5aefa95f732 100644
--- a/src/server/game/Server/Protocol/PacketLog.h
+++ b/src/server/game/Server/Protocol/PacketLog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Server/Protocol/ServerPktHeader.h b/src/server/game/Server/Protocol/ServerPktHeader.h
index 142979af70a..bc558ef2c9a 100644
--- a/src/server/game/Server/Protocol/ServerPktHeader.h
+++ b/src/server/game/Server/Protocol/ServerPktHeader.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldPacket.cpp b/src/server/game/Server/WorldPacket.cpp
index b2298c050d6..379ed906499 100644
--- a/src/server/game/Server/WorldPacket.cpp
+++ b/src/server/game/Server/WorldPacket.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Server/WorldPacket.h b/src/server/game/Server/WorldPacket.h
index 94df5dd990b..19c8e4dd2a5 100644
--- a/src/server/game/Server/WorldPacket.h
+++ b/src/server/game/Server/WorldPacket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 158966c43a4..384ea3ee405 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 70aebf71d80..f7b34b5e249 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 17b01eb161a..bdac20064f4 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 74d6c24b4e0..8c16508f5f7 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 5c392f23669..ca1737b823c 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2008 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index e409f8d2ea8..da53057b158 100644
--- a/src/server/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Skills/Archaeology/Archaeology.cpp b/src/server/game/Skills/Archaeology/Archaeology.cpp
index 80b15865fbd..e380e5b7e6d 100644
--- a/src/server/game/Skills/Archaeology/Archaeology.cpp
+++ b/src/server/game/Skills/Archaeology/Archaeology.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/Archaeology.h b/src/server/game/Skills/Archaeology/Archaeology.h
index 6ce016c8625..d76c267defe 100644
--- a/src/server/game/Skills/Archaeology/Archaeology.h
+++ b/src/server/game/Skills/Archaeology/Archaeology.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/ArchaeologyMgr.cpp b/src/server/game/Skills/Archaeology/ArchaeologyMgr.cpp
index 5b7bbdb2994..c38aa3d85d8 100644
--- a/src/server/game/Skills/Archaeology/ArchaeologyMgr.cpp
+++ b/src/server/game/Skills/Archaeology/ArchaeologyMgr.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/ArchaeologyMgr.h b/src/server/game/Skills/Archaeology/ArchaeologyMgr.h
index 41e2869d87b..9f85f6bc47a 100644
--- a/src/server/game/Skills/Archaeology/ArchaeologyMgr.h
+++ b/src/server/game/Skills/Archaeology/ArchaeologyMgr.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp b/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp
index 3376ce022bc..5cf2a21990f 100644
--- a/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp
+++ b/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/ArchaeologySites.cpp b/src/server/game/Skills/Archaeology/ArchaeologySites.cpp
index d0def0744fb..23be86a883f 100644
--- a/src/server/game/Skills/Archaeology/ArchaeologySites.cpp
+++ b/src/server/game/Skills/Archaeology/ArchaeologySites.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/SitePolygonGeometry.cpp b/src/server/game/Skills/Archaeology/SitePolygonGeometry.cpp
index 5e04b0a6964..a75a9e039c7 100644
--- a/src/server/game/Skills/Archaeology/SitePolygonGeometry.cpp
+++ b/src/server/game/Skills/Archaeology/SitePolygonGeometry.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/SitePolygonGraph.cpp b/src/server/game/Skills/Archaeology/SitePolygonGraph.cpp
index 4879fb8909a..81b867bb7ad 100644
--- a/src/server/game/Skills/Archaeology/SitePolygonGraph.cpp
+++ b/src/server/game/Skills/Archaeology/SitePolygonGraph.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/Archaeology/SitePolygonGraph.h b/src/server/game/Skills/Archaeology/SitePolygonGraph.h
index 1195a5270aa..f8b23e8ef04 100644
--- a/src/server/game/Skills/Archaeology/SitePolygonGraph.h
+++ b/src/server/game/Skills/Archaeology/SitePolygonGraph.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
index 2c17d3c7530..4c29c996ab8 100644
--- a/src/server/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Skills/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h
index faab16c44b3..8bc410740ed 100644
--- a/src/server/game/Skills/SkillDiscovery.h
+++ b/src/server/game/Skills/SkillDiscovery.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp
index 7236faa1ad0..534c555116c 100644
--- a/src/server/game/Skills/SkillExtraItems.cpp
+++ b/src/server/game/Skills/SkillExtraItems.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h
index 0afb26329f4..2db8a5a6c3a 100644
--- a/src/server/game/Skills/SkillExtraItems.h
+++ b/src/server/game/Skills/SkillExtraItems.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index 411b0aaf0fe..b655213585e 100644
--- a/src/server/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index a9907051592..edfa5525dcf 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -1768,7 +1768,7 @@ void AuraEffect::HandlePhaseGroup(AuraApplication const* aurApp, uint8 mode, boo
void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mode, bool apply) const
{
- if (!(mode & AURA_EFFECT_HANDLE_REAL))
+ if (!(mode & AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK))
return;
Unit* target = aurApp->GetTarget();
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
index 035993c1cbc..7a900cd3eb9 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.h
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 4d13dcef4d3..0786250b726 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -1706,7 +1706,7 @@ void Aura::PrepareProcToTrigger(AuraApplication* aurApp, ProcEventInfo& eventInf
return;
// take one charge, aura expiration will be handled in Aura::TriggerProcOnEvent (if needed)
- if (IsUsingCharges())
+ if (IsUsingCharges() && (!eventInfo.GetSpellInfo() || !eventInfo.GetSpellInfo()->HasAttribute(SPELL_ATTR6_DONT_CONSUME_PROC_CHARGES)))
{
--m_procCharges;
SetNeedClientUpdateForTargets();
diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
index 32eaf8585e8..426bddcd5db 100644
--- a/src/server/game/Spells/Auras/SpellAuras.h
+++ b/src/server/game/Spells/Auras/SpellAuras.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 493ee775553..41dcff51fda 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -789,7 +789,7 @@ void Spell::SelectSpellTargets()
if (m_spellInfo->IsChanneled())
{
// maybe do this for all spells?
- if (m_UniqueTargetInfo.empty() && m_UniqueGOTargetInfo.empty() && m_UniqueItemInfo.empty() && !m_targets.HasDst())
+ if (!focusObject && m_UniqueTargetInfo.empty() && m_UniqueGOTargetInfo.empty() && m_UniqueItemInfo.empty() && !m_targets.HasDst())
{
SendCastResult(SPELL_FAILED_BAD_IMPLICIT_TARGETS);
finish(false);
@@ -2502,7 +2502,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
DamageInfo spellDamageInfo(damageInfo, SPELL_DIRECT_DAMAGE, m_attackType, hitMask);
caster->ProcSkillsAndAuras(unitTarget, procAttacker, procVictim, PROC_SPELL_TYPE_DAMAGE, PROC_SPELL_PHASE_HIT, hitMask, this, &spellDamageInfo, nullptr);
- if (caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR0_STOP_ATTACK_TARGET) &&
+ if (caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR0_STOP_ATTACK_TARGET) && !m_spellInfo->HasAttribute(SPELL_ATTR4_CANT_TRIGGER_ITEM_SPELLS) &&
(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED))
caster->ToPlayer()->CastItemCombatSpell(spellDamageInfo);
}
@@ -2519,7 +2519,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
DamageInfo spellNoDamageInfo(damageInfo, NODAMAGE, m_attackType, hitMask);
caster->ProcSkillsAndAuras(unitTarget, procAttacker, procVictim, PROC_SPELL_TYPE_NO_DMG_HEAL, PROC_SPELL_PHASE_HIT, hitMask, this, &spellNoDamageInfo, nullptr);
- if (caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR0_STOP_ATTACK_TARGET) &&
+ if (caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR0_STOP_ATTACK_TARGET) && !m_spellInfo->HasAttribute(SPELL_ATTR4_CANT_TRIGGER_ITEM_SPELLS) &&
(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED))
caster->ToPlayer()->CastItemCombatSpell(spellNoDamageInfo);
}
@@ -3408,13 +3408,15 @@ void Spell::_cast(bool skipCheck)
CallScriptAfterCastHandlers();
- if (const std::vector *spell_triggered = sSpellMgr->GetSpellLinked(m_spellInfo->Id))
+ if (std::vector const* spell_triggered = sSpellMgr->GetSpellLinked(m_spellInfo->Id))
{
- for (std::vector::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i)
- if (*i < 0)
- m_caster->RemoveAurasDueToSpell(-(*i));
+ for (int32 id : *spell_triggered)
+ {
+ if (id < 0)
+ m_caster->RemoveAurasDueToSpell(-id);
else
- m_caster->CastSpell(m_targets.GetUnitTarget() ? m_targets.GetUnitTarget() : m_caster, *i, true);
+ m_caster->CastSpell(m_targets.GetUnitTarget() ? m_targets.GetUnitTarget() : m_caster, id, true);
+ }
}
if (modOwner)
@@ -5200,7 +5202,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
if (DynamicObject* dynObj = m_caster->GetDynObject(m_triggeredByAuraSpell->Id))
losTarget = dynObj;
- if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS) && !DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, NULL, SPELL_DISABLE_LOS) && !target->IsWithinLOSInMap(losTarget, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::M2))
+ if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS) && !m_spellInfo->HasAttribute(SPELL_ATTR5_SKIP_CHECKCAST_LOS_CHECK) && !DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, nullptr, SPELL_DISABLE_LOS) && !target->IsWithinLOSInMap(losTarget, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::M2))
return SPELL_FAILED_LINE_OF_SIGHT;
}
}
@@ -5212,7 +5214,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
float x, y, z;
m_targets.GetDstPos()->GetPosition(x, y, z);
- if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS) && !DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, NULL, SPELL_DISABLE_LOS) && !m_caster->IsWithinLOS(x, y, z, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::M2))
+ if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS) && !m_spellInfo->HasAttribute(SPELL_ATTR5_SKIP_CHECKCAST_LOS_CHECK) && !DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, nullptr, SPELL_DISABLE_LOS) && !m_caster->IsWithinLOS(x, y, z, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::M2))
return SPELL_FAILED_LINE_OF_SIGHT;
}
@@ -7073,8 +7075,8 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
return true; // spell is deletable, finish event
}
// event will be re-added automatically at the end of routine)
- } break;
-
+ break;
+ }
case SPELL_STATE_DELAYED:
{
// first, check, if we have just started
@@ -7128,13 +7130,14 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + m_Spell->GetDelayMoment(), false);
return false; // event not complete
}
- } break;
-
+ break;
+ }
default:
{
// all other states
// event will be re-added automatically at the end of routine)
- } break;
+ break;
+ }
}
// spell processing not complete, plan event on the next update interval
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index b03b6761316..dfe12af5a01 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 5b23bfbc9ae..52aac213a6d 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -1579,7 +1579,8 @@ void Spell::EffectEnergize(SpellEffIndex effIndex)
Powers power = Powers(m_spellInfo->Effects[effIndex].MiscValue);
- if (unitTarget->GetTypeId() == TYPEID_PLAYER && unitTarget->getPowerType() != power && !m_spellInfo->HasAttribute(SPELL_ATTR7_CAN_RESTORE_SECONDARY_POWER))
+ if (unitTarget->GetTypeId() == TYPEID_PLAYER && unitTarget->getPowerType() != power && m_spellInfo->SpellFamilyName != SPELLFAMILY_POTION
+ && !m_spellInfo->HasAttribute(SPELL_ATTR7_CAN_RESTORE_SECONDARY_POWER))
return;
if (unitTarget->GetMaxPower(power) == 0)
@@ -3016,7 +3017,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
// if (addPctMods) { percent mods are added in Unit::CalculateDamage } else { percent mods are added in Unit::MeleeDamageBonusDone }
// this distinction is neccessary to properly inform the client about his autoattack damage values from Script_UnitDamage
- bool const addPctMods = !m_spellInfo->HasAttribute(SPELL_ATTR6_NO_DONE_PCT_DAMAGE_MODS) && (m_spellSchoolMask & SPELL_SCHOOL_MASK_NORMAL);
+ bool const addPctMods = !m_spellInfo->HasAttribute(SPELL_ATTR6_LIMIT_PCT_DAMAGE_MODS) && (m_spellSchoolMask & SPELL_SCHOOL_MASK_NORMAL);
if (addPctMods)
{
UnitMods unitMod;
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index f393bf74025..10362cd764f 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Spells/SpellHistory.h b/src/server/game/Spells/SpellHistory.h
index c93d3e67e66..35d756fc0a5 100644
--- a/src/server/game/Spells/SpellHistory.h
+++ b/src/server/game/Spells/SpellHistory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 64731c06e30..c45bda78a39 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
index 2ee08a927b9..58bb9979bc6 100644
--- a/src/server/game/Spells/SpellInfo.h
+++ b/src/server/game/Spells/SpellInfo.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f6ff79fc4fd..86a1afc2752 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -3402,6 +3402,14 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_NEARBY_ENTRY);
});
+ ApplySpellFix({
+ 19503, // Scatter Shot
+ 34490 // Silencing Shot
+ }, [](SpellInfo* spellInfo)
+ {
+ spellInfo->Speed = 0.f;
+ });
+
// Safeguard
ApplySpellFix({
46946, // (Rank 1)
@@ -3808,7 +3816,7 @@ void SpellMgr::LoadSpellInfoCorrections()
ApplySpellFix({ 70106 }, [](SpellInfo* spellInfo)
{
spellInfo->AttributesEx3 |= SPELL_ATTR3_NO_DONE_BONUS;
- spellInfo->AttributesEx6 |= SPELL_ATTR6_NO_DONE_PCT_DAMAGE_MODS;
+ spellInfo->AttributesEx6 |= SPELL_ATTR6_LIMIT_PCT_DAMAGE_MODS;
});
// Ice Lock
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index f39dc33a25d..b870cf56386 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index d489209df30..5c81eb0bce1 100644
--- a/src/server/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
index 4a36babe34c..acd070e11a6 100644
--- a/src/server/game/Spells/SpellScript.h
+++ b/src/server/game/Spells/SpellScript.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Storages/WhoListStorage.cpp b/src/server/game/Storages/WhoListStorage.cpp
index d8a17c334fa..4921c2f4e42 100644
--- a/src/server/game/Storages/WhoListStorage.cpp
+++ b/src/server/game/Storages/WhoListStorage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Storages/WhoListStorage.h b/src/server/game/Storages/WhoListStorage.h
index 0b371fdf1e9..d4333005c27 100644
--- a/src/server/game/Storages/WhoListStorage.h
+++ b/src/server/game/Storages/WhoListStorage.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Texts/ChatTextBuilder.h b/src/server/game/Texts/ChatTextBuilder.h
index c913e177894..71c403332f8 100644
--- a/src/server/game/Texts/ChatTextBuilder.h
+++ b/src/server/game/Texts/ChatTextBuilder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp
index cafea34fcc5..6178da676fb 100644
--- a/src/server/game/Texts/CreatureTextMgr.cpp
+++ b/src/server/game/Texts/CreatureTextMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h
index 3f20d6185e4..85a0b895103 100644
--- a/src/server/game/Texts/CreatureTextMgr.h
+++ b/src/server/game/Texts/CreatureTextMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index ddeebf378d8..cf0ff431590 100644
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h
index 5aab1f4ed94..b807f00ac8e 100644
--- a/src/server/game/Tickets/TicketMgr.h
+++ b/src/server/game/Tickets/TicketMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Time/GameTime.cpp b/src/server/game/Time/GameTime.cpp
index 8884d4612be..466a4ac1861 100644
--- a/src/server/game/Time/GameTime.cpp
+++ b/src/server/game/Time/GameTime.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Time/GameTime.h b/src/server/game/Time/GameTime.h
index c1060d53e0b..b6968085db8 100644
--- a/src/server/game/Time/GameTime.h
+++ b/src/server/game/Time/GameTime.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Time/UpdateTime.cpp b/src/server/game/Time/UpdateTime.cpp
index 1cc9fd1c507..50d47b9b6ea 100644
--- a/src/server/game/Time/UpdateTime.cpp
+++ b/src/server/game/Time/UpdateTime.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Time/UpdateTime.h b/src/server/game/Time/UpdateTime.h
index 5d486a96323..b2282bf33e0 100644
--- a/src/server/game/Time/UpdateTime.h
+++ b/src/server/game/Time/UpdateTime.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
index 9e55780dd06..7027d4345d4 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h
index e6db1e54c8f..37c3a2b49c0 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.h
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2010 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index c5abc76da5c..af05314e4dd 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h
index f6ada756ecc..d694c6dbaaa 100644
--- a/src/server/game/Tools/PlayerDump.h
+++ b/src/server/game/Tools/PlayerDump.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h
index 6621eb33df8..ec3f9283eb8 100644
--- a/src/server/game/Warden/Modules/WardenModuleMac.h
+++ b/src/server/game/Warden/Modules/WardenModuleMac.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/Modules/WardenModuleWin.h b/src/server/game/Warden/Modules/WardenModuleWin.h
index 5dba7ad3060..70d7bb333a5 100644
--- a/src/server/game/Warden/Modules/WardenModuleWin.h
+++ b/src/server/game/Warden/Modules/WardenModuleWin.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
index fae8198e092..1da01289d2d 100644
--- a/src/server/game/Warden/Warden.cpp
+++ b/src/server/game/Warden/Warden.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/Warden.h b/src/server/game/Warden/Warden.h
index 8f851181f0f..20b4034aac3 100644
--- a/src/server/game/Warden/Warden.h
+++ b/src/server/game/Warden/Warden.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp
index 3a85a2f977d..794dd5cc085 100644
--- a/src/server/game/Warden/WardenCheckMgr.cpp
+++ b/src/server/game/Warden/WardenCheckMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h
index 4aac649cfa5..5a90d3f82c7 100644
--- a/src/server/game/Warden/WardenCheckMgr.h
+++ b/src/server/game/Warden/WardenCheckMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
index 12391db498b..22ecb1b6439 100644
--- a/src/server/game/Warden/WardenMac.cpp
+++ b/src/server/game/Warden/WardenMac.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h
index 68f9077a5a8..ef427476c55 100644
--- a/src/server/game/Warden/WardenMac.h
+++ b/src/server/game/Warden/WardenMac.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
index 8f19559499e..5bd5fa2ccb9 100644
--- a/src/server/game/Warden/WardenWin.cpp
+++ b/src/server/game/Warden/WardenWin.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h
index 1b6dbe08011..6fd723aa371 100644
--- a/src/server/game/Warden/WardenWin.h
+++ b/src/server/game/Warden/WardenWin.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index c3a5d330887..d80f9b4b76f 100644
--- a/src/server/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index abb05aa20f4..7bc039fb6e7 100644
--- a/src/server/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index a2677a30fea..70f95f625ba 100644
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h
index e00f190b0dc..08c246ac197 100644
--- a/src/server/game/Weather/WeatherMgr.h
+++ b/src/server/game/Weather/WeatherMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index ec402579bdc..c614657273d 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -526,19 +526,6 @@ void World::LoadConfigSettings(bool reload)
for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) playerBaseMoveSpeed[i] = baseMoveSpeed[i] * rate_values[RATE_MOVESPEED];
rate_values[RATE_CORPSE_DECAY_LOOTED] = sConfigMgr->GetFloatDefault("Rate.Corpse.Decay.Looted", 0.5f);
- rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = sConfigMgr->GetFloatDefault("TargetPosRecalculateRange", 1.5f);
- if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] < CONTACT_DISTANCE)
- {
- TC_LOG_ERROR("server.loading", "TargetPosRecalculateRange (%f) must be >= %f. Using %f instead.", rate_values[RATE_TARGET_POS_RECALCULATION_RANGE], CONTACT_DISTANCE, CONTACT_DISTANCE);
- rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = CONTACT_DISTANCE;
- }
- else if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] > NOMINAL_MELEE_RANGE)
- {
- TC_LOG_ERROR("server.loading", "TargetPosRecalculateRange (%f) must be <= %f. Using %f instead.",
- rate_values[RATE_TARGET_POS_RECALCULATION_RANGE], NOMINAL_MELEE_RANGE, NOMINAL_MELEE_RANGE);
- rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = NOMINAL_MELEE_RANGE;
- }
-
rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = sConfigMgr->GetFloatDefault("DurabilityLoss.OnDeath", 10.0f);
if (rate_values[RATE_DURABILITY_LOSS_ON_DEATH] < 0.0f)
{
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index d8a79514fa6..f5e710d9299 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
@@ -480,7 +480,6 @@ enum Rates
RATE_TALENT,
RATE_CORPSE_DECAY_LOOTED,
RATE_INSTANCE_RESET_TIME,
- RATE_TARGET_POS_RECALCULATION_RANGE,
RATE_DURABILITY_LOSS_ON_DEATH,
RATE_DURABILITY_LOSS_DAMAGE,
RATE_DURABILITY_LOSS_PARRY,
diff --git a/src/server/ipc/CMakeLists.txt b/src/server/ipc/CMakeLists.txt
index f66a4953ada..df996cb8bdb 100644
--- a/src/server/ipc/CMakeLists.txt
+++ b/src/server/ipc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/ipc/Commands.cpp b/src/server/ipc/Commands.cpp
index ff733e10dbe..712846abc15 100644
--- a/src/server/ipc/Commands.cpp
+++ b/src/server/ipc/Commands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/Commands.h b/src/server/ipc/Commands.h
index 9e0888132f4..42e8a9a855a 100644
--- a/src/server/ipc/Commands.h
+++ b/src/server/ipc/Commands.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZMQTask.cpp b/src/server/ipc/ZMQTask.cpp
index f1a4ea5cc84..746b85fd651 100644
--- a/src/server/ipc/ZMQTask.cpp
+++ b/src/server/ipc/ZMQTask.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZMQTask.h b/src/server/ipc/ZMQTask.h
index ba6e108766f..912c5248a13 100644
--- a/src/server/ipc/ZMQTask.h
+++ b/src/server/ipc/ZMQTask.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqContext.cpp b/src/server/ipc/ZmqContext.cpp
index d60a59799f4..b0c71eb04c6 100644
--- a/src/server/ipc/ZmqContext.cpp
+++ b/src/server/ipc/ZmqContext.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqContext.h b/src/server/ipc/ZmqContext.h
index 4349f1c2e4d..be159d2e9d2 100644
--- a/src/server/ipc/ZmqContext.h
+++ b/src/server/ipc/ZmqContext.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqListener.cpp b/src/server/ipc/ZmqListener.cpp
index 9e752e4481b..a3a512d1baa 100644
--- a/src/server/ipc/ZmqListener.cpp
+++ b/src/server/ipc/ZmqListener.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqListener.h b/src/server/ipc/ZmqListener.h
index 19d120124f7..ffead69395a 100644
--- a/src/server/ipc/ZmqListener.h
+++ b/src/server/ipc/ZmqListener.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqMux.cpp b/src/server/ipc/ZmqMux.cpp
index fbf266610cf..0676f753e8c 100644
--- a/src/server/ipc/ZmqMux.cpp
+++ b/src/server/ipc/ZmqMux.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqMux.h b/src/server/ipc/ZmqMux.h
index 02e49735c86..7ac201e10a1 100644
--- a/src/server/ipc/ZmqMux.h
+++ b/src/server/ipc/ZmqMux.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqWorker.cpp b/src/server/ipc/ZmqWorker.cpp
index 26c26f079e0..9685c7bd1ca 100644
--- a/src/server/ipc/ZmqWorker.cpp
+++ b/src/server/ipc/ZmqWorker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/ipc/ZmqWorker.h b/src/server/ipc/ZmqWorker.h
index 47ee8e887f1..d1ec3874336 100644
--- a/src/server/ipc/ZmqWorker.h
+++ b/src/server/ipc/ZmqWorker.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index bdea306cbc1..1197a13b350 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index cf35ccda565..70ac16d9dca 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp
index ddfd35e17e4..47e6c0a744e 100644
--- a/src/server/scripts/Commands/cs_achievement.cpp
+++ b/src/server/scripts/Commands/cs_achievement.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_ahbot.cpp b/src/server/scripts/Commands/cs_ahbot.cpp
index 08fa562cdb6..33a218fc407 100644
--- a/src/server/scripts/Commands/cs_ahbot.cpp
+++ b/src/server/scripts/Commands/cs_ahbot.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp
index bfcb82d3eba..813f7cd67fa 100644
--- a/src/server/scripts/Commands/cs_arena.cpp
+++ b/src/server/scripts/Commands/cs_arena.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp
index 5ace6d3ed11..671f07af84a 100644
--- a/src/server/scripts/Commands/cs_ban.cpp
+++ b/src/server/scripts/Commands/cs_ban.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_battlenet_account.cpp b/src/server/scripts/Commands/cs_battlenet_account.cpp
index df9b80109ac..b0e39c72393 100644
--- a/src/server/scripts/Commands/cs_battlenet_account.cpp
+++ b/src/server/scripts/Commands/cs_battlenet_account.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
index 6c4097a79b6..90e21792f81 100644
--- a/src/server/scripts/Commands/cs_bf.cpp
+++ b/src/server/scripts/Commands/cs_bf.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp
index 7806c1e42cd..1f38d8c00f5 100644
--- a/src/server/scripts/Commands/cs_cast.cpp
+++ b/src/server/scripts/Commands/cs_cast.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index 9b6830231b3..aea4d48a81c 100644
--- a/src/server/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp
index da0afbc349f..19522709fc5 100644
--- a/src/server/scripts/Commands/cs_cheat.cpp
+++ b/src/server/scripts/Commands/cs_cheat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -56,9 +56,6 @@ public:
static bool HandleGodModeCheatCommand(ChatHandler* handler, const char* args)
{
- if (!handler->GetSession() && !handler->GetSession()->GetPlayer())
- return false;
-
std::string argstr = (char*)args;
if (!*args)
@@ -82,9 +79,6 @@ public:
static bool HandleCasttimeCheatCommand(ChatHandler* handler, const char* args)
{
- if (!handler->GetSession() && !handler->GetSession()->GetPlayer())
- return false;
-
std::string argstr = (char*)args;
if (!*args)
@@ -108,9 +102,6 @@ public:
static bool HandleCoolDownCheatCommand(ChatHandler* handler, const char* args)
{
- if (!handler->GetSession() && !handler->GetSession()->GetPlayer())
- return false;
-
std::string argstr = (char*)args;
if (!*args)
@@ -134,9 +125,6 @@ public:
static bool HandlePowerCheatCommand(ChatHandler* handler, const char* args)
{
- if (!handler->GetSession() && !handler->GetSession()->GetPlayer())
- return false;
-
std::string argstr = (char*)args;
if (!*args)
@@ -178,9 +166,6 @@ public:
static bool HandleWaterWalkCheatCommand(ChatHandler* handler, const char* args)
{
- if (!handler->GetSession() && !handler->GetSession()->GetPlayer())
- return false;
-
std::string argstr = (char*)args;
Player* target = handler->GetSession()->GetPlayer();
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 856d3e18e7d..c454957e1f2 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp
index d1778d14999..e069e7a5f38 100644
--- a/src/server/scripts/Commands/cs_deserter.cpp
+++ b/src/server/scripts/Commands/cs_deserter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp
index 9fa7069d57f..f1b5fcde60d 100644
--- a/src/server/scripts/Commands/cs_disable.cpp
+++ b/src/server/scripts/Commands/cs_disable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp
index 6f68e8909b1..f5b6eeb1578 100644
--- a/src/server/scripts/Commands/cs_event.cpp
+++ b/src/server/scripts/Commands/cs_event.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index c47be969620..1aeedff799a 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index abac0e57387..8224b83a33d 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 52f661da597..aa3d71eaccc 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index b6b281f84be..e65e21728c9 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
index 0e5d4af41bc..2c7e6f66385 100644
--- a/src/server/scripts/Commands/cs_guild.cpp
+++ b/src/server/scripts/Commands/cs_guild.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp
index 4cff715fd2c..23435e88746 100644
--- a/src/server/scripts/Commands/cs_honor.cpp
+++ b/src/server/scripts/Commands/cs_honor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index ff1a1c4da88..da577d4affe 100644
--- a/src/server/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 94800e3de9b..ced838678a8 100644
--- a/src/server/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp
index 56836ebf1e9..a58e085c157 100644
--- a/src/server/scripts/Commands/cs_lfg.cpp
+++ b/src/server/scripts/Commands/cs_lfg.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
index df4ae7ab6a8..934c7a0e91f 100644
--- a/src/server/scripts/Commands/cs_list.cpp
+++ b/src/server/scripts/Commands/cs_list.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index b23d38e64b8..0a9c00367f9 100644
--- a/src/server/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp
index ca7fdd2ade2..ec893c52680 100644
--- a/src/server/scripts/Commands/cs_message.cpp
+++ b/src/server/scripts/Commands/cs_message.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 4d649067f0b..a105bee1f9d 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp
index eacce7560fe..5babfe82484 100644
--- a/src/server/scripts/Commands/cs_mmaps.cpp
+++ b/src/server/scripts/Commands/cs_mmaps.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index beba216abee..d7a8f3e2ca4 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -500,221 +500,15 @@ public:
if (!*args)
return false;
- uint16 mId = 1147;
- float speed = (float)15;
- uint32 num = 0;
+ char const* mount_cstr = strtok(const_cast(args), " ");
+ char const* speed_cstr = strtok(nullptr, " ");
- num = atoi((char*)args);
- switch (num)
+ if (!mount_cstr || !speed_cstr)
+ return false;
+
+ uint32 mount = atoul(mount_cstr);
+ if (!sCreatureDisplayInfoStore.LookupEntry(mount))
{
- case 1:
- mId=14340;
- break;
- case 2:
- mId=4806;
- break;
- case 3:
- mId=6471;
- break;
- case 4:
- mId=12345;
- break;
- case 5:
- mId=6472;
- break;
- case 6:
- mId=6473;
- break;
- case 7:
- mId=10670;
- break;
- case 8:
- mId=10719;
- break;
- case 9:
- mId=10671;
- break;
- case 10:
- mId=10672;
- break;
- case 11:
- mId=10720;
- break;
- case 12:
- mId=14349;
- break;
- case 13:
- mId=11641;
- break;
- case 14:
- mId=12244;
- break;
- case 15:
- mId=12242;
- break;
- case 16:
- mId=14578;
- break;
- case 17:
- mId=14579;
- break;
- case 18:
- mId=14349;
- break;
- case 19:
- mId=12245;
- break;
- case 20:
- mId=14335;
- break;
- case 21:
- mId=207;
- break;
- case 22:
- mId=2328;
- break;
- case 23:
- mId=2327;
- break;
- case 24:
- mId=2326;
- break;
- case 25:
- mId=14573;
- break;
- case 26:
- mId=14574;
- break;
- case 27:
- mId=14575;
- break;
- case 28:
- mId=604;
- break;
- case 29:
- mId=1166;
- break;
- case 30:
- mId=2402;
- break;
- case 31:
- mId=2410;
- break;
- case 32:
- mId=2409;
- break;
- case 33:
- mId=2408;
- break;
- case 34:
- mId=2405;
- break;
- case 35:
- mId=14337;
- break;
- case 36:
- mId=6569;
- break;
- case 37:
- mId=10661;
- break;
- case 38:
- mId=10666;
- break;
- case 39:
- mId=9473;
- break;
- case 40:
- mId=9476;
- break;
- case 41:
- mId=9474;
- break;
- case 42:
- mId=14374;
- break;
- case 43:
- mId=14376;
- break;
- case 44:
- mId=14377;
- break;
- case 45:
- mId=2404;
- break;
- case 46:
- mId=2784;
- break;
- case 47:
- mId=2787;
- break;
- case 48:
- mId=2785;
- break;
- case 49:
- mId=2736;
- break;
- case 50:
- mId=2786;
- break;
- case 51:
- mId=14347;
- break;
- case 52:
- mId=14346;
- break;
- case 53:
- mId=14576;
- break;
- case 54:
- mId=9695;
- break;
- case 55:
- mId=9991;
- break;
- case 56:
- mId=6448;
- break;
- case 57:
- mId=6444;
- break;
- case 58:
- mId=6080;
- break;
- case 59:
- mId=6447;
- break;
- case 60:
- mId=4805;
- break;
- case 61:
- mId=9714;
- break;
- case 62:
- mId=6448;
- break;
- case 63:
- mId=6442;
- break;
- case 64:
- mId=14632;
- break;
- case 65:
- mId=14332;
- break;
- case 66:
- mId=14331;
- break;
- case 67:
- mId=8469;
- break;
- case 68:
- mId=2830;
- break;
- case 69:
- mId=2346;
- break;
- default:
handler->SendSysMessage(LANG_NO_MOUNT);
handler->SetSentErrorMessage(true);
return false;
@@ -732,24 +526,14 @@ public:
if (handler->HasLowerSecurity(target, ObjectGuid::Empty))
return false;
+ float speed;
+ if (!CheckModifySpeed(handler, speed_cstr, target, speed, 0.1f, 50.0f))
+ return false;
+
NotifyModification(handler, target, LANG_YOU_GIVE_MOUNT, LANG_MOUNT_GIVED);
-
- target->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP);
- target->Mount(mId);
-
- WorldPacket data(SMSG_MOVE_SET_RUN_SPEED, (8+4+1+4));
- data << target->GetPackGUID();
- data << (uint32)0;
- data << (uint8)0; //new 2.1.0
- data << float(speed);
- target->SendMessageToSet(&data, true);
-
- data.Initialize(SMSG_MOVE_SET_SWIM_SPEED, (8+4+4));
- data << target->GetPackGUID();
- data << (uint32)0;
- data << float(speed);
- target->SendMessageToSet(&data, true);
-
+ target->Mount(mount);
+ target->SetSpeedRate(MOVE_RUN, speed);
+ target->SetSpeedRate(MOVE_FLIGHT, speed);
return true;
}
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 64baa0a551c..febfea88553 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp
index 96550dce62a..d893ce63387 100644
--- a/src/server/scripts/Commands/cs_pet.cpp
+++ b/src/server/scripts/Commands/cs_pet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index 6d944c75711..e75610f8d46 100644
--- a/src/server/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_rbac.cpp b/src/server/scripts/Commands/cs_rbac.cpp
index eb646d8bcd8..1da04269d43 100644
--- a/src/server/scripts/Commands/cs_rbac.cpp
+++ b/src/server/scripts/Commands/cs_rbac.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index 72e7f986d4a..7e6ddb25064 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index 1b4cec7c272..76cbade7973 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_script_loader.cpp b/src/server/scripts/Commands/cs_script_loader.cpp
index 5f34d6178fd..55dbb6040a3 100644
--- a/src/server/scripts/Commands/cs_script_loader.cpp
+++ b/src/server/scripts/Commands/cs_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp
index 0289b713c6f..2f4565111f1 100644
--- a/src/server/scripts/Commands/cs_send.cpp
+++ b/src/server/scripts/Commands/cs_send.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index 96067b7b18f..037f5f87f7a 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index b880b1130c1..be818f6ff42 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp
index 1e8baefdd4c..ec372bc2ea4 100644
--- a/src/server/scripts/Commands/cs_ticket.cpp
+++ b/src/server/scripts/Commands/cs_ticket.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp
index c49c9421f3c..495f548ce15 100644
--- a/src/server/scripts/Commands/cs_titles.cpp
+++ b/src/server/scripts/Commands/cs_titles.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index ab39d436def..4327ac4c52c 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Custom/custom_script_loader.cpp b/src/server/scripts/Custom/custom_script_loader.cpp
index b74145a18cd..87e53ae554a 100644
--- a/src/server/scripts/Custom/custom_script_loader.cpp
+++ b/src/server/scripts/Custom/custom_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index f0edc7af0c7..a17ba9bc37d 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 9b18098417f..5c1718c1211 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -76,7 +76,7 @@ public:
summons.DespawnAll();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 4a74f9ad720..6dccb51dce6 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,7 +61,7 @@ public:
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_WHIRLWIND, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 82ddfd4c071..3f12ff07c5c 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -62,7 +62,7 @@ public:
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CLEAVE, urand(1 * IN_MILLISECONDS, 9 * IN_MILLISECONDS));
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index f1cbd631d18..f612a2b7f2e 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -67,7 +67,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(YELL_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h b/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h
index ef409622c3f..99a54e39684 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
index 4d08037d9b9..d9376959e9f 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -93,9 +93,9 @@ class boss_alizabal : public CreatureScript
_skewer = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_RANDOM_CAST, 10000);
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
index 698e80cce03..c8e800b3da2 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -63,9 +63,9 @@ class boss_occuthar : public CreatureScript
ASSERT(_vehicle);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_SEARING_SHADOWS, 8 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
index 55f3cf92b63..0ee1f21fc97 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -64,9 +64,9 @@ class boss_pit_lord_argaloth : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_METEOR_SLASH, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
events.ScheduleEvent(EVENT_CONSUMING_DARKNESS, urand(20 * IN_MILLISECONDS, 25 * IN_MILLISECONDS));
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
index a34ebc657e1..95b09b1246f 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
index 43d0575e509..2088ece999f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -152,7 +152,7 @@ public: npc_twilight_flame_caller() : CreatureScript("npc_twilight_flame_caller"
_summons.DespawnAll();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_combatPhase = true;
@@ -261,7 +261,7 @@ class npc_twilight_torturer : public CreatureScript
_events.ScheduleEvent(EVENT_INFLICT_PAIN_TT, urand(6000, 18000));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_combatPhase = true;
@@ -361,7 +361,7 @@ class npc_twilight_sadist : public CreatureScript
_events.ScheduleEvent(EVENT_INFLICT_PAIN_TS, urand(6000, 18000));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_combatPhase = true;
@@ -455,7 +455,7 @@ class npc_mad_prisoner : public CreatureScript
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_events.ScheduleEvent(EVENT_HEAD_CRACK, 9000);
@@ -525,7 +525,7 @@ class npc_crazed_mage : public CreatureScript
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_events.ScheduleEvent(EVENT_HEAD_CRACK2, 9000);
@@ -604,7 +604,7 @@ class npc_raz_the_crazed : public CreatureScript
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_events.ScheduleEvent(SPELL_FURIOUS_SWIPE, 500);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
index 38d442a0228..bacce4b721a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
index 3575bc74485..4e441b9900d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -56,9 +56,9 @@ class boss_ascendant_lord_obsidius : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_MANA_TAP, 30000);
Talk(YELL_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
index 7a3d47e03a5..6fbac750144 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -57,9 +57,9 @@ class boss_beauty : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(SPELL_MAGMA_SPIT, urand(7000, 10000));
events.ScheduleEvent(EVENT_BERSERKER_CHARGE, urand(16000, 19000));
events.ScheduleEvent(EVENT_FLAMEBREAK, urand(18000, 22000));
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
index f7451d38562..1d8189dd0e4 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,9 +61,9 @@ class boss_corla : public CreatureScript
events.ScheduleEvent(EVENT_DRAIN_ESSENSE, 2000);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(YELL_AGGRO);
events.Reset();
combatPhase = true;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
index 73b8c2f2b38..c48f699c75c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -56,9 +56,9 @@ class boss_karsh_steelbender : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(YELL_AGGRO);
events.ScheduleEvent(EVENT_CLEAVE, 10000);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
index 0250e6fac24..9f39937ee49 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -74,9 +74,9 @@ class boss_romogg_bonecrusher : public CreatureScript
Talk(YELL_KILL);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CHAINS_OF_WOE, urand(22000, 32000));
events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(26000, 32000));
events.ScheduleEvent(EVENT_QUAKE, 45000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
index 42a15cbcd6a..7f3d28823f0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
index 0e685770ce2..fbf46c7d331 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
index 9944300d7f1..02fe43a9a4a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
index 41beda843e4..0fea151f9de 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -43,7 +43,7 @@ class boss_ambassador_flamelash : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_FIREBLAST, 2000);
_events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
index 37b7e892ae5..d08404f2fac 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -287,9 +287,9 @@ public:
{
npc_coren_direbrew_sistersAI(Creature* creature) : ScriptedAI(creature) { }
- void SetGUID(ObjectGuid guid, int32 data) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (data == DATA_TARGET_GUID)
+ if (id == DATA_TARGET_GUID)
_targetGUID = guid;
}
@@ -301,7 +301,7 @@ public:
return ObjectGuid::Empty;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCastSelf(SPELL_PORT_TO_COREN);
@@ -403,10 +403,10 @@ public:
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_ANTAGONIST_COMBAT, who);
- ScriptedAI::EnterCombat(who);
+ ScriptedAI::JustEngagedWith(who);
}
};
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index b3b3a0f2b4c..d144eaaedc0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -54,7 +54,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->CallForHelp(VISIBLE_RANGE);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
index c17de75a6cf..f6985eaef6b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -54,7 +54,7 @@ class boss_general_angerforge : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.SetPhase(PHASE_ONE);
_events.ScheduleEvent(EVENT_MIGHTYBLOW, 8000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index 691df9b587d..177c44801b2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -48,7 +48,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4000);
_events.ScheduleEvent(EVENT_MANABURN, 14000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
index fe432438811..af8e1fe96c3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,7 +51,7 @@ class boss_magmus : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.SetPhase(PHASE_ONE);
_events.ScheduleEvent(EVENT_FIERY_BURST, 5000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
index b1cc51e37a9..59d09243435 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -50,7 +50,7 @@ class boss_moira_bronzebeard : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
//_events.ScheduleEvent(EVENT_HEAL, 12000); // not used atm // These times are probably wrong
_events.ScheduleEvent(EVENT_MINDBLAST, 16000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
index f86b36f3ec1..dc3f59e89b8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -194,7 +194,7 @@ class boss_doomrel : public CreatureScript
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10000);
_events.ScheduleEvent(EVENT_IMMOLATE, 18000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
index 1bc8d78b79a..04ae339e36e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
index 8251d96dc58..b78b6f2cbb8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
index 56f5580daa0..4b22d9e0410 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -50,9 +50,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FIRE_NOVA, 6000);
events.ScheduleEvent(EVENT_CLEAVE, 8000);
events.ScheduleEvent(EVENT_CONFLIGURATION, 15000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
index 5e76a4e020b..5c54180d569 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -58,9 +58,9 @@ public:
me->GetMotionMaster()->MovePath(GIZRUL_PATH, false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000));
events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000));
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
index 34eae895bae..e81b17ea291 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -75,9 +75,9 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000));
events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000));
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
index 7626afd3fff..ad8282b91fd 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,9 +61,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_REND, urand(17000,20000));
events.ScheduleEvent(EVENT_THRASH, urand(10000,12000));
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
index a8766ac625b..40d53887ba9 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -51,9 +51,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FRENZY, 20000);
events.ScheduleEvent(EVENT_KNOCK_AWAY, 18000);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
index 17ae664c816..1764b6f9dca 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -63,9 +63,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000));
events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000));
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
index aaf86640eb7..3abd40a4f30 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -52,9 +52,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CRYSTALIZE, 20 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index 18689249237..fdcd20cb8fb 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -75,9 +75,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_SHOUT, 2 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_CLEAVE, 6 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
index 9dcaf290cb8..537d77673ca 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -119,7 +119,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
// ### TODO Check combat timing ###
events.ScheduleEvent(EVENT_FIRENOVA, 6000);
@@ -363,7 +363,7 @@ public:
_events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1000);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
// Used to close doors
if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true))
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
index aff9775b795..801caa36a99 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -47,9 +47,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHOOT, 1000);
events.ScheduleEvent(EVENT_STUN_BOMB, 16000);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index 1e99e07f9e0..ca4262b3b52 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -179,9 +179,9 @@ public:
portcullisGUID.Clear();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_WHIRLWIND, urand(13000, 15000));
events.ScheduleEvent(EVENT_CLEAVE, urand(15000, 17000));
events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000));
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index 79d556fc51d..664d30a1c7f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -54,9 +54,9 @@ public:
//DoCast(me, SPELL_ICEARMOR, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_HEX, 8 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
index 5cd6e60a186..33d4418cd88 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -53,9 +53,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FLAME_BREAK, 12 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_IMMOLATE, 3 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
index 0b4e238a8b1..766de94cad6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -53,9 +53,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(SPELL_REND, urand(17000,20000));
events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000));
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
index b1db789dcb3..81a8bc0d73e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -54,9 +54,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_UPPERCUT, 20 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index bf6197110fa..3e0c246a236 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
index 79f47eeb412..c8deabbf989 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
index 2973622d842..e684eab8861 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -52,9 +52,9 @@ public:
{
boss_broodlordAI(Creature* creature) : BossAI(creature, DATA_BROODLORD_LASHLAYER) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CLEAVE, 8000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
index 7198bd276e6..7670184c5e1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -191,9 +191,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHIMMER, 0);
events.ScheduleEvent(EVENT_BREATH_1, 30000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
index 44332ac7663..e4db85c21fe 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -43,9 +43,9 @@ public:
{
boss_ebonrocAI(Creature* creature) : BossAI(creature, DATA_EBONROC) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
index 958ff2ef3fa..32b829ad8f6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -43,9 +43,9 @@ public:
{
boss_firemawAI(Creature* creature) : BossAI(creature, DATA_FIREMAW) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
index 9161c6bb4ca..87fa92b7c0a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -48,9 +48,9 @@ public:
{
boss_flamegorAI(Creature* creature) : BossAI(creature, DATA_FLAMEGOR) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index 4f5074d470d..549aaf7d17c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -200,7 +200,7 @@ public:
void BeginEvent(Player* target)
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_GAMESBEGIN_2);
@@ -420,7 +420,7 @@ public:
canDespawn = true;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SHADOWFLAME, 12000);
events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000));
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
index cbedc69d001..35ae604dbab 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index 784cf554303..8c2163b61e3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -93,9 +93,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
DoCast(me, SPELL_ESSENCEOFTHERED);
me->SetHealth(me->CountPctFromMaxHealth(30));
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index 05054bcacb7..4496e017f8f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
index 7f473c00f53..1d33b3d3158 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -62,9 +62,9 @@ class boss_baron_geddon : public CreatureScript
{
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_INFERNO, 45000);
events.ScheduleEvent(EVENT_IGNITE_MANA, 30000);
events.ScheduleEvent(EVENT_LIVING_BOMB, 35000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
index 64e59f480bf..000c91bc8e8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -57,9 +57,9 @@ class boss_garr : public CreatureScript
{
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25000);
events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
index b55c939bfec..f4bdbf13eca 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -53,9 +53,9 @@ class boss_gehennas : public CreatureScript
{
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000);
events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10000);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
index 1fa97bdecdb..5f1282b1827 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -69,9 +69,9 @@ class boss_golemagg : public CreatureScript
DoCast(me, SPELL_MAGMASPLASH, true);
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_PYROBLAST, 7000);
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
index 190aa91aa6d..cb5bd8735f5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -53,9 +53,9 @@ class boss_lucifron : public CreatureScript
{
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10000);
events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 20000);
events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
index 6ed123d465b..3bdcf9fc29f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -65,9 +65,9 @@ class boss_magmadar : public CreatureScript
DoCast(me, SPELL_MAGMA_SPIT, true);
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_FRENZY, 30000);
events.ScheduleEvent(EVENT_PANIC, 20000);
events.ScheduleEvent(EVENT_LAVA_BOMB, 12000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
index d0028bdd658..09a69147019 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -87,9 +87,9 @@ class boss_majordomo : public CreatureScript
Talk(SAY_SLAY);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000);
events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
index 481472f854e..4cb0da232d2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -104,9 +104,9 @@ class boss_ragnaros : public CreatureScript
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_ERUPTION, 15000);
events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 30000);
events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 25000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
index 1ea9a069588..1740cf2c546 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -49,9 +49,9 @@ class boss_shazzrah : public CreatureScript
{
boss_shazzrahAI(Creature* creature) : BossAI(creature, BOSS_SHAZZRAH) { }
- void EnterCombat(Unit* target) override
+ void JustEngagedWith(Unit* target) override
{
- BossAI::EnterCombat(target);
+ BossAI::JustEngagedWith(target);
events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6000);
events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 10000);
events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 24000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
index 6f1cfa94114..7395118da66 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -67,9 +67,9 @@ class boss_sulfuron : public CreatureScript
{
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- BossAI::EnterCombat(victim);
+ BossAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_DARK_STRIKE, 10000);
events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15000);
events.ScheduleEvent(EVENT_INSPIRE, 13000);
@@ -157,9 +157,9 @@ class npc_flamewaker_priest : public CreatureScript
events.Reset();
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
- ScriptedAI::EnterCombat(victim);
+ ScriptedAI::JustEngagedWith(victim);
events.ScheduleEvent(EVENT_HEAL, urand(15000, 30000));
events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000);
events.ScheduleEvent(EVENT_IMMOLATE, 8000);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
index 47797d09332..93eca4da251 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
index 45037170b7e..c7bd9d19283 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
index b9d3a96f338..896c48be763 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -100,7 +100,7 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
index 569e871cf7a..057d572ba39 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
index 33abf4b8eee..a55645a0187 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index b7d8f6c4dfd..6f11785abaf 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2008 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp b/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
index 64dff86ab65..2f228ab3c1c 100644
--- a/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
index 18bdc09d2d5..1bafd880b60 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
index 4cf4fcd0a1d..82e1d2af29b 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
index 9a8ec451232..c2e01b94190 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index 3c4025084d2..3b54edf9e18 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -77,9 +77,9 @@ public:
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_HATEFUL_BOLT, Seconds(12));
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 2adb2d445e6..92d570cf3a4 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,9 +65,9 @@ public:
_JustDied();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
DoCastSelf(SPELL_HOLYGROUND, true);
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index d111172bdbc..9c77230e483 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -207,9 +207,9 @@ public:
BossAI::JustDied(killer);
}
- void SetGUID(ObjectGuid guid, int32 data) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (data == NPC_MIDNIGHT)
+ if (id == NPC_MIDNIGHT)
_midnightGUID = guid;
}
@@ -337,9 +337,9 @@ public:
BossAI::JustSummoned(summon);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
scheduler.Schedule(Seconds(15), Seconds(25), [this](TaskContext task)
{
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
index 1adbbec120f..b9f2959f031 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2008 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -153,7 +153,7 @@ public:
DoZoneInCombat();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
StartEvent();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
index d026182fcb5..45e14a60f33 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -259,7 +259,7 @@ public:
Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
HandleDoors(false);
SwitchToPortalPhase();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 7926f2ab05e..30f5e6d0110 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -176,9 +176,9 @@ public:
instance->HandleGameObject(instance->GetGuidData(DATA_MASTERS_TERRACE_DOOR_2), open);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(YELL_AGGRO);
SetupGroundPhase();
}
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index 3fc3dd1c8f8..e4a98b5c0af 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ public:
InfernalPoint *point;
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -268,7 +268,7 @@ public:
instance->HandleGameObject(instance->GetGuidData(DATA_GO_NETHER_DOOR), true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index d3a580f5159..bc9d8576cf3 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -171,7 +171,7 @@ public:
instance->HandleGameObject(instance->GetGuidData(DATA_GO_LIBRARY_DOOR), true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -535,7 +535,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index d1743771363..d1ae4a5f0e9 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -85,9 +85,9 @@ public:
events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 2b9562b0d6c..b82ef9ef252 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_DOROTHEE_AGGRO);
}
@@ -262,7 +262,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
@@ -358,7 +358,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_STRAWMAN_AGGRO);
}
@@ -465,7 +465,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_TINHEAD_AGGRO);
}
@@ -595,7 +595,7 @@ public:
ScriptedAI::AttackStart(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_ROAR_AGGRO);
}
@@ -704,7 +704,7 @@ public:
Talk(SAY_CRONE_SLAY);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_CRONE_AGGRO);
}
@@ -767,7 +767,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override
@@ -884,7 +884,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_WOLF_AGGRO);
}
@@ -1108,7 +1108,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* who) override
{
@@ -1273,7 +1273,7 @@ public:
TC_LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen.");
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_ROMULO_AGGRO);
if (JulianneGUID)
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index 6e0dd3b1ee5..b75698ec558 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index cc678f8b534..86a7f5a5481 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -177,7 +177,7 @@ public:
Start(false, false);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void WaypointReached(uint32 waypointId) override
{
@@ -480,7 +480,7 @@ public:
me->RemoveCorpse();
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MovementInform(uint32 type, uint32 id) override
{
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index c36b99e6e49..f799840c310 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index d558d007b35..c50e8fdccca 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -176,7 +176,7 @@ public:
RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air.
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetBossState(DATA_KAELTHAS, IN_PROGRESS);
}
@@ -464,7 +464,7 @@ public:
DoCast(me, SPELL_FLAMESTRIKE2, true);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
@@ -518,7 +518,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* /*killer*/, uint32 &damage) override
{
@@ -623,7 +623,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -666,7 +666,7 @@ public:
DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index ca816e8f512..1756dcc9383 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -161,7 +161,7 @@ public:
instance->SetBossState(DATA_DELRISSA, FAIL);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO);
@@ -393,7 +393,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!who)
return;
@@ -642,7 +642,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_SUMMON_IMP);
}
@@ -950,7 +950,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_BATTLE_SHOUT);
}
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index fdf43e5dc18..70ed742aec6 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -128,10 +128,10 @@ class boss_selin_fireheart : public CreatureScript
crystal->KillSelf();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 421c5ac45af..6ff76c94e8f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -87,10 +87,10 @@ class boss_vexallus : public CreatureScript
_JustDied();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000);
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index d145944bf35..bdf0c5f1f8b 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index 588086b1225..fa78c2a7ffb 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
index cfdee423ef1..d6f35e09514 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 67330fe9648..72f59624564 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -132,7 +132,7 @@ public:
me->LoadEquipment(0, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST);
events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST);
@@ -305,7 +305,7 @@ public:
ObjectGuid prisonerGUID;
- void SetGUID(ObjectGuid guid, int32 /*id*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
if (!prisonerGUID)
prisonerGUID = guid;
@@ -846,7 +846,7 @@ public:
{
npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->ExitVehicle();
}
@@ -1169,7 +1169,7 @@ class npc_scarlet_miner : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 /*id = 0*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
InitWaypoint();
Start(false, false, guid);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index c2779bcdf4b..7e51397a1c2 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -407,7 +407,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_TREE2);
me->Dismount();
@@ -508,7 +508,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_VALROTH_AGGRO);
DoCast(who, SPELL_VALROTH_SMITE);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 1bcda1676ce..2f8ed573d22 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
index f1904a50e04..bed8c4b25c3 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index cad5668aec8..62671996334 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,9 +60,9 @@ class boss_arcanist_doan : public CreatureScript
_healthAbove50Pct = true;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SILENCE, 15 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 8816caacaa8..6d07ed32e9d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,9 +51,9 @@ class boss_azshir_the_sleepless : public CreatureScript
_siphon = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000);
events.ScheduleEvent(EVENT_TERRIFY, 20000);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 5b0d888c922..7afbcb78ec1 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,10 +60,10 @@ class boss_bloodmage_thalnos : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FLAME_SHOCK, 10000);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
events.ScheduleEvent(EVENT_FLAME_SPIKE, 8000);
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 4d377bc075f..960dd836a66 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ public:
uint32 _spell;
uint32 _spell2;
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SetType(uint32 _type)
{
switch (Creaturetype = _type)
@@ -255,7 +255,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SaySound(uint8 textEntry, Unit* target = 0)
{
@@ -499,7 +499,7 @@ public:
++id;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetBossState(DATA_HORSEMAN_EVENT, IN_PROGRESS);
DoZoneInCombat();
@@ -818,7 +818,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 7d3f0dd941c..7d3f0600b6a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -77,11 +77,11 @@ class boss_herod : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoCast(me, SPELL_RUSHINGCHARGE);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CLEAVE, 12000);
events.ScheduleEvent(EVENT_WHIRLWIND, 60000);
@@ -160,7 +160,7 @@ public:
void Reset() override { }
void WaypointReached(uint32 /*waypointId*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index 12e28747256..3c1763fee9e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ public:
instance->SetBossState(DATA_HIGH_INQUISITOR_FAIRBANKS, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
instance->SetBossState(DATA_HIGH_INQUISITOR_FAIRBANKS, IN_PROGRESS);
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 3ec1664ee74..fe02c765e27 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -49,10 +49,10 @@ class boss_houndmaster_loksey : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BLOODLUST, 20000);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index dd2443c12d7..0d51eb0c115 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,10 +61,10 @@ class boss_interrogator_vishas : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index cea8aa3b600..5ff1100798b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ public:
instance->SetBossState(DATA_MOGRAINE_AND_WHITE_EVENT, FAIL);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_MO_AGGRO);
DoCast(me, SPELL_RETRIBUTIONAURA);
@@ -276,7 +276,7 @@ public:
ScriptedAI::AttackStart(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_WH_INTRO);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index 8d901572e2f..ef292a811c3 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -49,9 +49,9 @@ class boss_scorn : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_LICH_SLAP, 45000);
events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000);
events.ScheduleEvent(EVENT_MIND_FLAY, 30000);
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index cd07bedc628..6fa715f3902 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
index fede79df5d3..b335f400c42 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 338aa2f62d0..dc54d93953c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,9 +70,9 @@ class boss_darkmaster_gandling : public CreatureScript
gate->SetGoState(GO_STATE_ACTIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500);
events.ScheduleEvent(EVENT_SHADOWSHIELD, 12000);
events.ScheduleEvent(EVENT_CURSE, 2000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
index e1b491e7453..b3eb0a63e26 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ public:
DoCast(me, 23261, true); //Summon Darkreaver's Fallen Charger
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
};
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 03a2bf0f293..f8157d5a98b 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -53,9 +53,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript
{
boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_REND, 8000);
events.ScheduleEvent(EVENT_BACKHAND, 9000);
events.ScheduleEvent(EVENT_FRENZY, 1000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index 730700cc90e..16190336984 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,9 +51,9 @@ class boss_illucia_barov : public CreatureScript
{
boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000);
events.ScheduleEvent(EVENT_SHADOWSHOCK, 9000);
events.ScheduleEvent(EVENT_SILENCE, 5000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index e7a3bf99b43..e69a8c98a7d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,9 +70,9 @@ class boss_instructor_malicia : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000);
events.ScheduleEvent(EVENT_CORRUPTION, 8000);
events.ScheduleEvent(EVENT_RENEW, 32000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index a55ecfe6a84..f91612b050a 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -57,7 +57,7 @@ public:
Summons.Summon(summoned);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 15000);
events.ScheduleEvent(EVENT_ILLUSION, 30000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
index 51228f1a193..4207781273f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -83,7 +83,7 @@ class boss_kirtonos_the_herald : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000));
events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000));
@@ -93,7 +93,7 @@ class boss_kirtonos_the_herald : public CreatureScript
events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, urand(53000, 53000));
events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(34000, 48000));
events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(20000, 20000));
- _EnterCombat();
+ _JustEngagedWith();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index 121d6b51b42..28f37fbbc05 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,7 +65,7 @@ public:
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000);
events.ScheduleEvent(EVENT_BONE_SHIELD, 2000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index 82feeaf5dd9..0ad2ac0e18c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -55,9 +55,9 @@ class boss_lord_alexei_barov : public CreatureScript
DoCast(me, SPELL_UNHOLY_AURA);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_IMMOLATE, 7000);
events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000);
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index c162de33a3b..0a4b2cbe50b 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -50,9 +50,9 @@ class boss_lorekeeper_polkelt : public CreatureScript
{
boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000);
events.ScheduleEvent(EVENT_DARKPLAGUE, 8000);
events.ScheduleEvent(EVENT_CORROSIVEACID, 45000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 77244dc7a93..428116953e3 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -53,7 +53,7 @@ public:
DoCast(me, SPELL_ICE_ARMOR);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ICE_ARMOR, 2000);
events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index d2e54bf433c..a9cbb6aa660 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -50,9 +50,9 @@ class boss_the_ravenian : public CreatureScript
{
boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_TRAMPLE, 24000);
events.ScheduleEvent(EVENT_CLEAVE, 15000);
events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index d24648b6d81..b201b69f219 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -52,7 +52,7 @@ public:
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_FIRE_SHIELD, 2000);
events.ScheduleEvent(EVENT_BLAST_WAVE, 14000);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index c6c3c6c4d10..8487d005b5d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
index abe6a7b415a..843dbfea3d0 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index 5c819417932..fa34bf45b5e 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 9e84eb6f59e..24c9c7a6437 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index ad78cc71b06..611891d4b13 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -142,7 +142,7 @@ public:
}
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
};
};
@@ -258,9 +258,9 @@ class boss_archmage_arugal : public CreatureScript
Talk(SAY_TRANSFORM);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CURSE, Seconds(7));
events.ScheduleEvent(EVENT_TELEPORT, Seconds(15));
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index 7571f6f8fe3..76cbb1f7ae3 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index ed8b2cfc853..1aff5f8cfcb 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
index f44a914121e..4d797738638 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
index 23111e1d0fc..e1bcc623fbf 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -126,7 +126,7 @@ public:
me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index 7fcb5e0ec0b..b5486b3666c 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -127,7 +127,7 @@ public:
TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
index 389aa1b497d..82eb0d7da69 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@ public:
me->SetDisplayId(MODEL_HUMAN);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index 768c414a01c..4ee45c20264 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@ public:
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_FROSTBOLT, 1 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_ICETOMB, 16 * IN_MILLISECONDS);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
index c38ba7aad1d..2ed56f52ff1 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
index f1052bc16dc..1103f0da89b 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
index 23b2e55c928..38222441133 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@ class boss_postmaster_malown : public CreatureScript
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_WAILINGDEAD, 19000); // lasts 6 sec
events.ScheduleEvent(EVENT_BACKHAND, 8000); // 2 sec stun
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
index 51725964ac5..9ced8a87773 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
index 6508c527cc0..ebac2b87c01 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (!HasYelled)
{
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 426b1d0ec49..e9b2a8d5982 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index bcd673b8c12..ea5b5cb6755 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -147,7 +147,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* caster, const SpellInfo* spell) override
{
@@ -238,7 +238,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
index dc16dc2e0f7..7e66f5f5245 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
index 396d3f0c004..eb84492cd47 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
index 466270d618e..664b483aafe 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
index c5b994c0844..02090247a07 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index bde2a220398..6bd77a81017 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ public:
instance->SetBossState(DATA_BRUTALLUS, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(YELL_AGGRO);
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index 9691dcd2197..fb3815f8eb9 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -130,7 +130,7 @@ public:
instance->SetBossState(DATA_EREDAR_TWINS, NOT_STARTED);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
DoZoneInCombat();
@@ -382,7 +382,7 @@ public:
instance->SetBossState(DATA_EREDAR_TWINS, NOT_STARTED);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
DoZoneInCombat();
@@ -671,7 +671,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 6eaecffa2bb..2d93bd45a15 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -154,7 +154,7 @@ public:
instance->SetBossState(DATA_FELMYST, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_BERSERK, 600000);
@@ -529,7 +529,7 @@ public:
}
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
//DoCast(me, SPELL_VAPOR_FORCE, true); core bug
@@ -565,7 +565,7 @@ public:
}
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 70cdfa85c19..93e19ea87bf 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -344,7 +344,7 @@ public:
damage = 0;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
Talk(SAY_EVIL_AGGRO);
@@ -633,7 +633,7 @@ public:
TeleportAllPlayersBack();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* Kalec = me->SummonCreature(NPC_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
{
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 0d52fcbe25d..1cebe7c96d8 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -642,7 +642,7 @@ public:
ENSURE_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -945,7 +945,7 @@ public:
summoned->SetLevel(me->getLevel());
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
instance->SetBossState(DATA_KILJAEDEN, IN_PROGRESS);
if (Creature* pControl = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KILJAEDEN_CONTROLLER)))
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index 6a9b4b122c7..e2543484e09 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -274,9 +274,9 @@ public:
});
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
DoCast(me, SPELL_OPEN_PORTAL_PERIODIC, true);
DoCast(me, SPELL_DARKNESS_PERIODIC, true);
DoCast(me, SPELL_NEGATIVE_ENERGY_PERIODIC, true);
@@ -470,7 +470,7 @@ public:
muru->AI()->JustSummoned(me);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_SHADOW_PULSE_PERIODIC, true);
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 1976aab174d..89a34b16080 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
index f38d31ef02e..2bee54da43d 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
index eb99ba3ebae..886bc196fb2 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp
index 8f4fb2c51a1..d9a3e55c9c0 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp
+++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -66,9 +66,9 @@ public:
{
boss_hoggerAI(Creature* creature) : BossAI(creature, DATA_HOGGER), _hasEnraged(false) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_PULL);
events.ScheduleEvent(EVENT_VICIOUS_SLICE, Seconds(3), Seconds(4));
events.ScheduleEvent(EVENT_MADDENING_CALL, Seconds(1), Seconds(2));
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp
index 3a9e74c7146..966019d9fc4 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp
+++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -48,9 +48,9 @@ public:
{
boss_lord_overheatAI(Creature* creature) : BossAI(creature, DATA_LORD_OVERHEAT) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_PULL);
events.ScheduleEvent(EVENT_FIREBALL, Seconds(2));
events.ScheduleEvent(EVENT_OVERHEAT, Seconds(9), Seconds(11));
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp
index e0395bd154f..c301b60935b 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp
+++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,9 +70,9 @@ public:
secondVanish = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_PULL);
events.ScheduleEvent(EVENT_WILDLY_STABBING, Seconds(4), Seconds(5));
events.ScheduleEvent(EVENT_SWEEP, Seconds(2), Seconds(3));
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
index 1d4a09e9066..7887341e182 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
+++ b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
index 4e2e4ea34e9..2f21b85b3b3 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
+++ b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index ec1208f035f..c2602dda1cc 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2007 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ class boss_archaedas : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetFaction(FACTION_MONSTER);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -267,7 +267,7 @@ class npc_archaedas_minions : public CreatureScript
me->AddAura(SPELL_MINION_FREEZE_ANIM, me);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetFaction (FACTION_MONSTER);
me->RemoveAllAuras();
@@ -356,7 +356,7 @@ class npc_stonekeepers : public CreatureScript
me->AddAura(SPELL_MINION_FREEZE_ANIM, me);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetFaction(FACTION_MONSTER);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
index 98b94e09c70..222a161742c 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ class boss_ironaya : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 uiDiff) override
{
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index bd332448f2c..48b8fbc30cf 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2007 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
index 9f229bafa79..fc9dbba2766 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ class npc_jadespine_basilisk : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
index 0578da35895..8e44d51c55b 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 849075df145..b29d4eea4c8 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -111,7 +111,7 @@ class boss_akilzon : public CreatureScript
SetWeather(WEATHER_STATE_FINE, 0.0f);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000)); // 20 to 30 seconds(bosskillers)
@@ -121,7 +121,7 @@ class boss_akilzon : public CreatureScript
events.ScheduleEvent(EVENT_ENRAGE, 10*MINUTE*IN_MILLISECONDS); // 10 minutes till enrage(bosskillers)
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
//DoZoneInCombat();
instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
}
@@ -397,7 +397,7 @@ class npc_akilzon_eagle : public CreatureScript
me->SetDisableGravity(true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
index 2e655b32d8e..1a391de8a18 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -59,10 +59,10 @@ class boss_daakara : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 8c519f51df1..64b614214f6 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ class boss_halazzi : public CreatureScript
EnterPhase(PHASE_LYNX);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
Talk(SAY_AGGRO);
@@ -363,7 +363,7 @@ class npc_halazzi_lynx : public CreatureScript
ScriptedAI::AttackStart(who);
}
- void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
+ void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index c49bc9e90e9..708fdec67c5 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2007 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -200,7 +200,7 @@ struct boss_hexlord_addAI : public ScriptedAI
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -277,7 +277,7 @@ class boss_hexlord_malacrass : public CreatureScript
me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 08170c73eee..dab70287d7a 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -182,7 +182,7 @@ class boss_janalai : public CreatureScript
Talk(SAY_SLAY);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);
@@ -451,7 +451,7 @@ class npc_janalai_firebomb : public CreatureScript
DoCast(me, SPELL_FIRE_BOMB_DUMMY, true);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
@@ -533,7 +533,7 @@ class npc_janalai_hatcher : public CreatureScript
return num == 0; // if num == 0, no more templist
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -634,7 +634,7 @@ class npc_janalai_hatchling : public CreatureScript
me->SetDisableGravity(true);
}
- void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
+ void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index 669af1ffe2a..85cb72a3e17 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -262,7 +262,7 @@ class boss_nalorakk : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 96c4ae944fa..71de631ee54 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
index bd13a10a48a..24f56f3132f 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
index 813a8096505..fb986e8e125 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index b3e4ce5ec9a..64020b71f9c 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ class boss_grilek : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index fdf42cf6921..1d43c4c38ca 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ class boss_hazzarah : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
index 3c7ccd33bf4..da99fe84bff 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -62,9 +62,9 @@ class boss_jindo_the_godbreaker : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
index 3013167360f..5b9a8052201 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -53,9 +53,9 @@ class boss_kilnara : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 93f6b3b1f32..ca17b847686 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -119,9 +119,9 @@ class boss_mandokir : public CreatureScript
_reviveGUID.Clear();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
DoCastAOE(SPELL_BLOODLORD_AURA);
@@ -213,7 +213,7 @@ class boss_mandokir : public CreatureScript
return 0;
}
- void SetGUID(ObjectGuid guid, int32 /*type = 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id = 0 **/) override
{
_reviveGUID = guid;
}
@@ -302,7 +302,7 @@ class npc_ohgan : public CreatureScript
_instance = me->GetInstanceScript();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCastAOE(SPELL_OHGAN_ORDERS, true);
}
@@ -369,7 +369,7 @@ class npc_chained_spirit : public CreatureScript
_revivePlayerGUID.Clear();
}
- void SetGUID(ObjectGuid guid, int32 /*type = 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id = 0 */) override
{
_revivePlayerGUID = guid;
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index 8b577bbbe8b..ab195ed351f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ class boss_renataki : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index 4303489ac70..69102a9cbc1 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -56,9 +56,9 @@ class boss_venoxis : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index b8e6a975f6c..56b2d180319 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ class boss_wushoolay : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
index 0721dcaf4c7..73021b0572d 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -55,9 +55,9 @@ class boss_zanzil : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index 9126663ce86..4522877a178 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
index e555226fcde..7a8278a2300 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
index 509c75ccb91..3ba242f7c10 100644
--- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -192,6 +192,7 @@ void AddSC_duskwood();
//void AddSC_eastern_plaguelands();
void AddSC_elwynn_forest();
void AddSC_ghostlands();
+void AddSC_goldshire();
void AddSC_hinterlands();
void AddSC_redridge_mountains();
void AddSC_silverpine_forest();
@@ -383,6 +384,7 @@ void AddEasternKingdomsScripts()
//AddSC_eastern_plaguelands();
AddSC_elwynn_forest();
AddSC_ghostlands();
+ AddSC_goldshire();
AddSC_hinterlands();
AddSC_redridge_mountains();
AddSC_silverpine_forest();
diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
index c9d846bd36c..a3501d45212 100644
--- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
summoned->AI()->AttackStart(me);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
index 2e4fd37554d..e2d948fd142 100644
--- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_dun_morogh.cpp b/src/server/scripts/EasternKingdoms/zone_dun_morogh.cpp
index a60f9fb9b37..77e5473d2b1 100644
--- a/src/server/scripts/EasternKingdoms/zone_dun_morogh.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_dun_morogh.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
index 007c114dea8..17060c30077 100644
--- a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
index e521a3d1bb7..f3e1db7d361 100644
--- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(YELL_TWILIGHT_CORRUPTOR_AGGRO);
_events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15000);
diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
index 3aa14e47c69..4c70966c936 100644
--- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -74,7 +74,7 @@ public:
SetCombatMovement(false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ASK_FOR_HELP, Seconds(RAND(1, 10) * 10));
}
@@ -162,7 +162,7 @@ public:
{
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (who->GetEntry() != NPC_STORWIND_INFANTRY)
isInfantry = false;
@@ -344,7 +344,7 @@ public:
_defeated = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_VICIOUS_SLICE, Seconds(5));
me->GetMotionMaster()->Clear(MOTION_SLOT_IDLE);
diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
index 5aef66e5d40..5ef3b74c2ec 100644
--- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/zone_goldshire.cpp b/src/server/scripts/EasternKingdoms/zone_goldshire.cpp
new file mode 100644
index 00000000000..95f5adde7eb
--- /dev/null
+++ b/src/server/scripts/EasternKingdoms/zone_goldshire.cpp
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2008-2018 TrinityCore
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+#include "ScriptMgr.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "GameEventMgr.h"
+#include "GameTime.h"
+#include "CreatureGroups.h"
+#include "ScriptedCreature.h"
+#include "CreatureAIImpl.h"
+
+enum COG_Paths
+{
+ STORMWIND_PATH = 80500,
+ GOLDSHIRE_PATH = 80501,
+ WOODS_PATH = 80502,
+ HOUSE_PATH = 80503,
+ LISA_PATH = 80700
+};
+
+enum COG_Waypoints
+{
+ STORMWIND_WAYPOINT = 57,
+ GOLDSHIRE_WAYPOINT = 32,
+ WOODS_WAYPOINT = 22,
+ HOUSE_WAYPOINT = 35,
+ LISA_WAYPOINT = 4
+};
+
+enum COG_Sounds
+{
+ BANSHEE_DEATH = 1171,
+ BANSHEEPREAGGRO = 1172,
+ CTHUN_YOU_WILL_DIE = 8585,
+ CTHUN_DEATH_IS_CLOSE = 8580,
+ HUMAN_FEMALE_EMOTE_CRY = 6916,
+ GHOSTDEATH = 3416
+};
+
+enum COG_Creatures
+{
+ NPC_DANA = 804,
+ NPC_CAMERON = 805,
+ NPC_JOHN = 806,
+ NPC_LISA = 807,
+ NPC_AARON = 810,
+ NPC_JOSE = 811
+};
+
+enum COG_Events
+{
+ EVENT_WP_START_GOLDSHIRE = 1,
+ EVENT_WP_START_WOODS = 2,
+ EVENT_WP_START_HOUSE = 3,
+ EVENT_WP_START_LISA = 4,
+ EVENT_PLAY_SOUNDS = 5,
+ EVENT_BEGIN_EVENT = 6
+};
+
+enum COG_GameEvent
+{
+ GAME_EVENT_CHILDEREN_OF_GOLDSHIRE = 76
+};
+
+struct npc_cameron : public ScriptedAI
+{
+ npc_cameron(Creature* creature) : ScriptedAI(creature)
+ {
+ _started = false;
+ }
+
+ static uint32 SoundPicker()
+ {
+ return RAND(
+ BANSHEE_DEATH,
+ BANSHEEPREAGGRO,
+ CTHUN_YOU_WILL_DIE,
+ CTHUN_DEATH_IS_CLOSE,
+ HUMAN_FEMALE_EMOTE_CRY,
+ GHOSTDEATH
+ );
+ }
+
+ void MoveTheChildren()
+ {
+ std::vector MovePosPositions =
+ {
+ { -9373.521f, -67.71767f, 69.201965f, 1.117011f },
+ { -9374.94f, -62.51654f, 69.201965f, 5.201081f },
+ { -9371.013f, -71.20811f, 69.201965f, 1.937315f },
+ { -9368.419f, -66.47543f, 69.201965f, 3.141593f },
+ { -9372.376f, -65.49946f, 69.201965f, 4.206244f },
+ { -9377.477f, -67.8297f, 69.201965f, 0.296706f }
+ };
+
+ Trinity::Containers::RandomShuffle(MovePosPositions);
+
+ // first we break formation because children will need to move on their own now
+ for (auto guid : _childrenGUIDs)
+ if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
+ if (child->GetFormation())
+ child->GetFormation()->RemoveMember(child);
+
+ // Move each child to an random position
+ for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)
+ {
+ if (Creature* children = ObjectAccessor::GetCreature(*me, _childrenGUIDs[i]))
+ {
+ children->SetWalk(true);
+ children->GetMotionMaster()->MovePoint(0, MovePosPositions.at(i));
+ me->SetHomePosition(MovePosPositions.at(i));
+ }
+ }
+ me->SetWalk(true);
+ me->GetMotionMaster()->MovePoint(0, MovePosPositions.back());
+ me->SetHomePosition(MovePosPositions.back());
+ }
+
+ void WaypointReached(uint32 waypointId, uint32 pathId)
+ {
+ switch (pathId)
+ {
+ case STORMWIND_PATH:
+ {
+ if (waypointId == STORMWIND_WAYPOINT)
+ {
+ me->GetMotionMaster()->MoveRandom(10.f);
+ _events.ScheduleEvent(EVENT_WP_START_GOLDSHIRE, Minutes(11));
+ }
+
+ break;
+ }
+ case GOLDSHIRE_PATH:
+ {
+ if (waypointId == GOLDSHIRE_WAYPOINT)
+ {
+ me->GetMotionMaster()->MoveRandom(10.f);
+ _events.ScheduleEvent(EVENT_WP_START_WOODS, Minutes(15));
+ }
+ break;
+ }
+ case WOODS_PATH:
+ {
+ if (waypointId == WOODS_WAYPOINT)
+ {
+ me->GetMotionMaster()->MoveRandom(10.f);
+ _events.ScheduleEvent(EVENT_WP_START_HOUSE, Minutes(6));
+ _events.ScheduleEvent(EVENT_WP_START_LISA, Seconds(2));
+ }
+
+ break;
+ }
+ case HOUSE_PATH:
+ {
+ if (waypointId == HOUSE_WAYPOINT)
+ {
+ // Move childeren at last point
+ MoveTheChildren();
+
+ // After 30 seconds a random sound should play
+ _events.ScheduleEvent(EVENT_PLAY_SOUNDS, Seconds(30));
+ }
+ break;
+ }
+ }
+ }
+
+ void OnGameEvent(bool start, uint16 eventId) override
+ {
+ if (start && eventId == GAME_EVENT_CHILDEREN_OF_GOLDSHIRE)
+ {
+ // Start event at 7 am
+ // Begin pathing
+ _events.ScheduleEvent(EVENT_BEGIN_EVENT, Seconds(2));
+ _started = true;
+ }
+ else if (!start && eventId == GAME_EVENT_CHILDEREN_OF_GOLDSHIRE)
+ {
+ // Reset event at 8 am
+ _started = false;
+ _events.Reset();
+ }
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ if (!_started)
+ return;
+
+ _events.Update(diff);
+
+ while (uint32 eventId = _events.ExecuteEvent())
+ {
+ switch (eventId)
+ {
+ case EVENT_WP_START_GOLDSHIRE:
+ me->GetMotionMaster()->MovePath(GOLDSHIRE_PATH, false);
+ break;
+ case EVENT_WP_START_WOODS:
+ me->GetMotionMaster()->MovePath(WOODS_PATH, false);
+ break;
+ case EVENT_WP_START_HOUSE:
+ me->GetMotionMaster()->MovePath(HOUSE_PATH, false);
+ break;
+ case EVENT_WP_START_LISA:
+ for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)
+ {
+ if (Creature* lisa = ObjectAccessor::GetCreature(*me, _childrenGUIDs[i]))
+ {
+ if (lisa->GetEntry() == NPC_LISA)
+ {
+ lisa->GetMotionMaster()->MovePath(LISA_PATH, false);
+ break;
+ }
+ }
+ }
+ break;
+ case EVENT_PLAY_SOUNDS:
+ me->PlayDistanceSound(SoundPicker());
+ break;
+ case EVENT_BEGIN_EVENT:
+ {
+ _childrenGUIDs.clear();
+
+ // Get all childeren's guid's.
+ if (Creature* dana = me->FindNearestCreature(NPC_DANA, 25.0f))
+ _childrenGUIDs.push_back(dana->GetGUID());
+
+ if (Creature* john = me->FindNearestCreature(NPC_JOHN, 25.0f))
+ _childrenGUIDs.push_back(john->GetGUID());
+
+ if (Creature* lisa = me->FindNearestCreature(NPC_LISA, 25.0f))
+ _childrenGUIDs.push_back(lisa->GetGUID());
+
+ if (Creature* aaron = me->FindNearestCreature(NPC_AARON, 25.0f))
+ _childrenGUIDs.push_back(aaron->GetGUID());
+
+ if (Creature* jose = me->FindNearestCreature(NPC_JOSE, 25.0f))
+ _childrenGUIDs.push_back(jose->GetGUID());
+
+ // If Formation was disbanded, remake.
+ if (!me->GetFormation()->isFormed())
+ for (auto guid : _childrenGUIDs)
+ if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
+ child->SearchFormation();
+
+ // Start movement
+ me->GetMotionMaster()->MovePath(STORMWIND_PATH, false);
+
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ }
+
+private:
+ EventMap _events;
+ bool _started;
+ GuidVector _childrenGUIDs;
+};
+
+void AddSC_goldshire()
+{
+ RegisterCreatureAI(npc_cameron);
+}
diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
index 328ac2e18df..181a3b778e6 100644
--- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER)
return;
diff --git a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
index e4a90dea992..85e43a11dcd 100644
--- a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
index 60f3a789b2a..c679eb32752 100644
--- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
index 026b5346aed..caca5fa20f1 100644
--- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -109,7 +109,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO, who);
}
diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
index 590c7a7acd5..87fdf71a01b 100644
--- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
index bb1cff818b7..2283aaa1c22 100644
--- a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
index cdc970369cf..720782f7f06 100644
--- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
index ba2fb6c4da2..04e1d1b8ada 100644
--- a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
index 4cbdf3b2e5a..3559c120d02 100644
--- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -127,7 +127,7 @@ public:
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoPlaySoundToSet(me, SOUND_AGGRO);
_events.ScheduleEvent(EVENT_FADE, 30000);
@@ -137,9 +137,9 @@ public:
_events.ScheduleEvent(EVENT_MULTI_SHOT, 10000);
}
- void SetGUID(ObjectGuid guid, int32 type) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == GUID_EVENT_INVOKER)
+ if (id == GUID_EVENT_INVOKER)
{
Talk(EMOTE_LAMENT);
DoPlaySoundToSet(me, SOUND_CREDIT);
@@ -294,7 +294,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
index 225035cae61..9dab028073b 100644
--- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DoDie()
{
diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
index f97527dcb4a..3dfdc6f8f0c 100644
--- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (HasEscortState(STATE_ESCORT_ESCORTING) && !IsFriendSummoned && GetPlayerForEscort())
{
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp
index cc38aed2964..49e537d84d7 100644
--- a/src/server/scripts/Events/childrens_week.cpp
+++ b/src/server/scripts/Events/childrens_week.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Events/events_script_loader.cpp b/src/server/scripts/Events/events_script_loader.cpp
index 4512b0fa28b..db7b4c4fca9 100644
--- a/src/server/scripts/Events/events_script_loader.cpp
+++ b/src/server/scripts/Events/events_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Events/fireworks_show.cpp b/src/server/scripts/Events/fireworks_show.cpp
index b6b9cacf053..bfe71f4aaad 100644
--- a/src/server/scripts/Events/fireworks_show.cpp
+++ b/src/server/scripts/Events/fireworks_show.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index a99f749d944..35b8113e9d6 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
index 98daa49ebb5..afcc8f6d38f 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
index cee400603e1..eae2e3b94db 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -54,9 +54,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000));
}
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
index a287751e3cd..76ee2f76e03 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -38,9 +38,9 @@ public:
{
boss_gelihastAI(Creature* creature) : BossAI(creature, DATA_GELIHAST) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000));
}
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
index 68d898fb611..5f176a1f77f 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -47,9 +47,9 @@ public:
{
boss_kelrisAI(Creature* creature) : BossAI(creature, DATA_KELRIS) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000));
events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000));
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index eca757c6177..f12c4caa574 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index c3fdb7b12f8..c37e1f59aea 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -84,7 +84,7 @@ public:
instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS);
@@ -211,7 +211,7 @@ public:
CheckTimer = 5000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index d36e7fda284..fcc7e384ded 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -129,7 +129,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* /*done_by*/, uint32 &damage) override
{
@@ -173,7 +173,7 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* /*done_by*/, uint32 &damage) override
{
@@ -223,7 +223,7 @@ public:
TargetGUID = who->GetGUID();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* /*done_by*/, uint32 &damage) override
{
@@ -297,10 +297,10 @@ public:
me->RemoveAllAuras(); // Reset Soul Charge auras.
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FEAR, 42000);
events.ScheduleEvent(EVENT_AIR_BURST, 30000);
events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000));
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 7e25fe6b384..53c76fefae5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -88,7 +88,7 @@ public:
instance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS);
@@ -216,7 +216,7 @@ public:
CheckTimer = 5000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 51b32c2f20f..9a7163e3aec 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -84,7 +84,7 @@ public:
instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index b6891597076..5af09c7a00e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -79,7 +79,7 @@ public:
instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index 38dbd8b6e7e..584118ef81d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
index caf7d690097..09ccb129778 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index db091296389..82e652f5269 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -431,7 +431,7 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/)
me->SetLootRecipient(NULL);
}
-void hyjalAI::EnterCombat(Unit* /*who*/)
+void hyjalAI::JustEngagedWith(Unit* /*who*/)
{
if (IsDummy)return;
for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
index b6dbe9e72ca..9f2af815163 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -125,7 +125,7 @@ struct hyjalAI : public npc_escortAI
void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override; // Send creature back to spawn location and evade.
- void EnterCombat(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack
+ void JustEngagedWith(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack
void UpdateAI(uint32 diff) override; // Called to summon waves, check for boss deaths and to cast our spells.
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index a0744b992f9..4a0a96092b6 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -438,7 +438,7 @@ public:
imol = false;
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void WaypointReached(uint32 waypointId) override
{
@@ -580,7 +580,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -680,7 +680,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -800,7 +800,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -895,7 +895,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -991,7 +991,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -1077,7 +1077,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -1177,7 +1177,7 @@ public:
me->SetPosition(x, y, z, 0);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -1423,7 +1423,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
index 66189f9c71d..8380700e752 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 7374bb12f2a..7633249c2ae 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
index 93fc93f348e..97ab07f55b6 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,10 +61,10 @@ class boss_epoch : public CreatureScript
{
boss_epochAI(Creature* creature) : BossAI(creature, DATA_EPOCH) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300);
events.ScheduleEvent(EVENT_TIME_WARP, 25300);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
index 1a7452732f9..ab5b114caf6 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,10 +60,10 @@ class boss_infinite_corruptor : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7000);
events.ScheduleEvent(EVENT_VOID_STRIKE, 5000);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index 1c05b82d06b..09f5cac86f3 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -109,7 +109,7 @@ public:
instance->SetBossState(DATA_MAL_GANIS, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
instance->SetBossState(DATA_MAL_GANIS, IN_PROGRESS);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
index e4252ab7e7a..8c311af424a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -53,10 +53,10 @@ class boss_meathook : public CreatureScript
Talk(SAY_SPAWN);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CHAIN, urand(12000, 17000));
events.ScheduleEvent(EVENT_DISEASE, urand(2000, 4000));
events.ScheduleEvent(EVENT_FRENZY, urand(21000, 26000));
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index cb512c02cf4..aef2c43b5c7 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,10 +60,10 @@ class boss_salramm : public CreatureScript
Talk(SAY_SPAWN);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CURSE_FLESH, 30000);
events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000));
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 9c0388e8931..a65e7aa7ba9 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -340,7 +340,7 @@ public:
npc_escortAI::AttackStart(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_ARTHAS_AURA);
}
@@ -1195,7 +1195,7 @@ public:
{
QuestStatus status = player->GetQuestStatus(13149);
if (status != QUEST_STATUS_COMPLETE && status != QUEST_STATUS_REWARDED)
- return false;
+ return true;
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
SendGossipMenuFor(player, 907, me->GetGUID());
break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
index 0cd1a7a6459..fc3ab0cdae8 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 00b6edb7ee3..cfdbcf5020a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index e23d81aab67..6b066ab7167 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
//This is not correct. Should taunt Thrall before engage in combat
Talk(SAY_TAUNT1);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index 2625434b09a..3ac0c244115 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index d5a7af487a9..68ee56c0e40 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -146,7 +146,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index a90769b4a43..b7963c30b4f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 227b89b459d..73ac4cfd18f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -497,7 +497,7 @@ public:
me->Dismount();
me->SetSpeedRate(MOVE_RUN, SPEED_RUN);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_TH_RANDOM_AGGRO);
if (me->IsMounted())
@@ -640,7 +640,7 @@ public:
}
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
index 52eb8a6c4f7..971d3e19c57 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
index 17b51ddb22f..962becd5386 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000));
events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000));
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
index 55482fd37d6..a967f15445d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000));
events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000));
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
index 3ad05a79065..63894490648 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000));
events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
index 053b670c254..09c79fd51dc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
index 6a15068e329..e54b10a5922 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -137,7 +137,7 @@ public:
//ScriptedAI::AttackStart(who);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
@@ -288,7 +288,7 @@ public:
else mWaveId = 1;
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DoSummonAtRift(uint32 creature_entry)
{
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
index c5274e9c985..8d477aaf473 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
index 22ee9fb6bea..cf2a3e1f771 100644
--- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
+++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
index 0a596c15919..faa94906e48 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -177,7 +177,7 @@ class npc_harbinger_of_flame : public CreatureScript
{
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
if (Creature* bird = ObjectAccessor::GetCreature(*me, me->GetChannelObjectGuid()))
DoZoneInCombat(bird, 200.0f);
@@ -277,7 +277,7 @@ class npc_blazing_monstrosity : public CreatureScript
AlysrazorTrashEvaded(me);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
DoZoneInCombat();
me->RemoveAurasDueToSpell(SPELL_SLEEP_ULTRA_HIGH_PRIORITY);
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
index 24d9052beed..927640be07b 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -135,9 +135,9 @@ class boss_baleroc : public CreatureScript
}
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(EMOTE_AGGRO);
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_INCENDIARY_SOUL, 8.5*IN_MILLISECONDS);
@@ -285,9 +285,9 @@ class boss_baleroc : public CreatureScript
DoBalerocAttackIfReady();
}
- void SetGUID(ObjectGuid guid, int32 type = 0) override
+ void SetGUID(ObjectGuid const& guid, int32 id = 0) override
{
- switch (type)
+ switch (id)
{
case GUID_TORMENTED:
{
diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.h b/src/server/scripts/Kalimdor/Firelands/firelands.h
index dc91816caef..1681156a8df 100644
--- a/src/server/scripts/Kalimdor/Firelands/firelands.h
+++ b/src/server/scripts/Kalimdor/Firelands/firelands.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
index 5cc3ce3d649..dd703a7ca97 100644
--- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
index 3cc85062c58..ab3c6fdd4f6 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -156,11 +156,11 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
Talk(ANRAPHET_SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index b749c57202a..de736261382 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -175,11 +175,11 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
index 04441bf56b3..6276f287a96 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -108,9 +108,9 @@ public:
MakeInterruptable(false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
me->SetReactState(REACT_AGGRESSIVE);
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
index 58dc2594d6c..8a183c8efa0 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -94,11 +94,11 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_DIVINE_RECKONING, urand(10000, 12000));
events.ScheduleEvent(EVENT_BURNING_LIGHT, 12000);
}
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
index df765995b3a..bcb3e727337 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
index fa8c2f77397..88a163aace0 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp
index 99c1365fd05..b1bb7ed2edf 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -103,9 +103,9 @@ public:
_shockwaveStalkerCount = 0;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_HAMMER_FIST, Seconds(10));
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp
index 75ea1aebe48..1da7989686b 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -131,9 +131,9 @@ public:
_repentanceStarted = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_FIFTY_LASHINGS, Seconds(9));
@@ -355,7 +355,7 @@ public:
_events.ScheduleEvent(EVENT_SOUL_SEVER, Seconds(11));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
_events.ScheduleEvent(EVENT_MAKE_AGGRESSIVE, Seconds(1) + Milliseconds(500));
@@ -442,7 +442,7 @@ public:
me->SetInPhase(PHASE_ID_REPENTANCE, true, false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
_events.ScheduleEvent(EVENT_MAKE_AGGRESSIVE, Seconds(1) + Milliseconds(500));
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
index 9dbf44074f2..e60b5e2f454 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -144,9 +144,9 @@ class boss_lockmaw : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_VISCOUS_POISON, Seconds(6));
events.ScheduleEvent(EVENT_SCENT_OF_BLOOD, Seconds(6));
@@ -265,9 +265,9 @@ class boss_augh : public CreatureScript
{
boss_aughAI(Creature* creature) : BossAI(creature, DATA_AUGH) { }
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->HandleEmoteCommand(EMOTE_ONESHOT_NONE);
events.SetPhase(PHASE_COMBAT);
DoCastSelf(SPELL_FRENZY);
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
index 6619b708f2f..55a648390b3 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h
index db66b5c2038..ca9b22bed3e 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
index 491b05063f4..f500c02e47d 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
index 37f79658906..7260e6ca008 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index 36514199010..00140dd228e 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SummonAdds(Unit* victim)
{
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
index e5b98337883..26c5a64b158 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
index b3e3552b4d5..d1e07046124 100644
--- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 52a86f5d2fa..4f0b6ed8523 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -158,9 +158,9 @@ public:
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index afb7c801a01..0252e241e26 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
index ba931c86ccd..8a934dedcd6 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
index c49d6b296ec..08a77673847 100644
--- a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
+++ b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index ffb75543d84..3bc1c0125f7 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -68,9 +68,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8000);
events.ScheduleEvent(EVENT_FROSTBOLT, 1000);
events.ScheduleEvent(EVENT_FROST_NOVA, urand(10000, 15000));
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp
index 553375db4f8..255e0685ac5 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -53,9 +53,9 @@ public:
hp15 = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
index 2f6e469f257..b35528416cd 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -58,9 +58,9 @@ public:
events.ScheduleEvent(EVENT_OOC_1, 10000);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.Reset();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_FIREBALL, 100);
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
index 2ad263d325b..86541a009be 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,9 +51,9 @@ public:
DoCast(me, SPELL_VIRULENT_POISON);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_WEB_SPRAY, urand(3000, 5000));
events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(9000, 14000));
}
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 5fcc2e15a35..8e3ceda7425 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index c7c10335276..c5a201bfc0b 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -109,7 +109,7 @@ public:
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (channeling)
Talk(SAY_WATCH_OUT, who);
@@ -330,7 +330,7 @@ public:
instance->SetData(DATA_WAVE, me->GetEntry());
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_WEB, urand(5000, 8000));
}
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
index 2501b399d11..a9840663884 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index c14383ffaa5..c22bbcfa2b1 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
index 64feea50156..8ac070acaa6 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2013 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO1, who);
}
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
index 1de42a0bb3a..07566ce7baa 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index 23247e0ba06..c24d27096b9 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -135,9 +135,9 @@ class boss_ayamiss : public CreatureScript
BossAI::EnterEvadeMode(why);
}
- void EnterCombat(Unit* attacker) override
+ void JustEngagedWith(Unit* attacker) override
{
- BossAI::EnterCombat(attacker);
+ BossAI::JustEngagedWith(attacker);
events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(20000, 30000));
events.ScheduleEvent(EVENT_POISON_STINGER, 5000);
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 735463744d7..846739ee566 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -83,9 +83,9 @@ class boss_buru : public CreatureScript
Eggs.clear();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(EMOTE_TARGET, who);
DoCast(me, SPELL_THORNS);
@@ -206,7 +206,7 @@ class npc_buru_egg : public CreatureScript
SetCombatMovement(false);
}
- void EnterCombat(Unit* attacker) override
+ void JustEngagedWith(Unit* attacker) override
{
if (Creature* buru = me->GetMap()->GetCreature(_instance->GetGuidData(DATA_BURU)))
if (!buru->IsInCombat())
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 1e8db0f104c..c7fb5836ed6 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index 9f214eb5e12..2e58dddede8 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 569f3a9105a..1c02e68fd0a 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -132,9 +132,9 @@ class boss_ossirian : public CreatureScript
Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.Reset();
events.ScheduleEvent(EVENT_SILENCE, 30000);
events.ScheduleEvent(EVENT_CYCLONE, 20000);
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 5fd456c0295..2d19fb74161 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -87,9 +87,9 @@ class boss_rajaxx : public CreatureScript
_JustDied();
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
}
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 2c3e23f4dd4..8f80c8e5356 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
index 944c2768b9d..1c8a9e8c70c 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index e229a5ea5a9..63656b2d10a 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -188,7 +188,7 @@ public:
instance->SetData(DATA_BUG_TRIO_DEATH, 1);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -289,7 +289,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 013a82e78d9..93e61ee4958 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -218,7 +218,7 @@ public:
pPortal->SetReactState(REACT_PASSIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM);
@@ -529,7 +529,7 @@ public:
instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -929,7 +929,7 @@ public:
KillSelfTimer = 35000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -1008,7 +1008,7 @@ public:
EvadeTimer = 5000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -1125,7 +1125,7 @@ public:
EvadeTimer = 5000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -1240,7 +1240,7 @@ public:
BeamTimer = 500;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index 011cf1509a5..677427cca3a 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@ public:
Spawn->AI()->AttackStart(victim);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index 45a61cecd47..01d454039bd 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 37740d27a55..b87efd49cdd 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCastVictim(SPELL_BIRTH);
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
index 006d6377b42..d29782b2622 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -90,7 +90,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
@@ -236,7 +236,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 26ccc6a9c8e..6b73875fc2d 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -131,9 +131,9 @@ class boss_skeram : public CreatureScript
me->RemoveCorpse();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.Reset();
events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(6000, 12000));
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 92bd20a2891..325aed87c6c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -149,7 +149,7 @@ struct boss_twinemperorsAI : public ScriptedAI
DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
DoZoneInCombat();
Creature* pOtherBoss = GetOtherBoss();
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index 1d41e808bc9..6a7838a7030 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -176,9 +176,9 @@ class boss_viscidus : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.Reset();
InitSpells();
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 054844c9c2f..8ddf7e7351d 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
index a4457b7e82b..2fbc2a0aba8 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -243,7 +243,7 @@ public:
me->AddAura(id, me);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (gatherOthersWhenAggro)
GetOtherSentinels(who);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
index 58e75af6276..33a3867cb0c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
index 514fb2a4791..c4bbba910e8 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -133,9 +133,9 @@ class boss_altairus : public CreatureScript
events.ScheduleEvent(EVENT_LIGHTNING_BLAST, 1000);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->SummonCreature(NPC_INVISIBLE_STALKER, InvisibleStalkerPos);
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
index 0163085056e..2d728fcd40b 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -190,9 +190,9 @@ class boss_asaad : public CreatureScript
events.ScheduleEvent(EVENT_STATIC_CLING, 10800);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
index 614e7487170..974b7a7215d 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -130,9 +130,9 @@ class boss_grand_vizier_ertan : public CreatureScript
events.ScheduleEvent(EVENT_SUMMON_TEMPEST, 17000);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
SummonErtansVortexes();
DoCast(me, SPELL_STORMS_EDGE_AURA);
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp
index 03067acbc68..5d84d694579 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
index 579095cedb2..b7ed526c8d6 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -150,7 +150,7 @@ public:
AttackStart(who);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
DoCast(me, SPELL_LURK_SEARCH);
}
@@ -277,7 +277,7 @@ public:
events.ScheduleEvent(EVENT_ATTACK, 6000);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
me->SetReactState(REACT_PASSIVE);
@@ -417,7 +417,7 @@ public:
DoCast(me, SPELL_SKYFALL_VISUAL);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
me->SetReactState(REACT_PASSIVE);
DoCast(me, SPELL_SKYFALL);
@@ -454,7 +454,7 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
me->SetReactState(REACT_PASSIVE);
DoCast(me, SPELL_ARCANE_BARRAGE);
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
index 8b4e203f40a..b4c330ac04c 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp
index 4de76e6e097..7234526e8a2 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -38,9 +38,9 @@ public:
{
boss_kreshAI(Creature* creature) : BossAI(creature, DATA_KRESH) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CRUSHING_BITE, Seconds(6));
}
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp
index 3782b5d65ca..6a348a01618 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -64,9 +64,9 @@ public:
DoCastSelf(SPELL_NATURE_CHANNELING);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
me->RemoveAurasDueToSpell(SPELL_NATURE_CHANNELING);
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp
index a24c8d99ae7..79696d4ef2c 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -55,9 +55,9 @@ public:
{
boss_lord_cobrahnAI(Creature* creature) : BossAI(creature, DATA_LORD_COBRAHN) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(1), 0, PHASE_NORMAL);
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp
index 7033944f902..e1e2cd0ab31 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -49,10 +49,10 @@ public:
{
boss_lord_pythasAI(Creature* creature) : BossAI(creature, DATA_LORD_PYTHAS) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(3));
events.ScheduleEvent(EVENT_THUNDERCLAP, Seconds(19));
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp
index 22d93673b42..e7605984739 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -47,10 +47,10 @@ public:
{
boss_lord_serpentisAI(Creature* creature) : BossAI(creature, DATA_LORD_SERPENTIS) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(1));
events.ScheduleEvent(EVENT_HEALING_TOUCH, Seconds(27));
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp
index 443158bb59f..dc7376a0498 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -38,9 +38,9 @@ public:
{
boss_skumAI(Creature* creature) : BossAI(creature, DATA_SKUM) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CHAINED_BOLT, Seconds(3), Seconds(4));
}
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp
index d92d7838bbf..8d2039f4be2 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -38,9 +38,9 @@ public:
{
boss_verdan_the_everlivingAI(Creature* creature) : BossAI(creature, DATA_VERDAN_THE_EVERLIVING) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_GRASPING_VINES, Seconds(20),Seconds(35));
}
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index 0dae89e5eb1..f78e86e7ebf 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
index 250ea964ff8..25ba260c2ff 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -167,7 +167,7 @@ public:
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_ATTACKED, who);
}
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
index 3eabc0f4b0a..6d08f3bf0dc 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
index 3bae896e0e1..ab95e1c8d8a 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -72,7 +72,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_SANCT_INVADE);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000);
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index cafd9a8c917..e41038a64dd 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index 176f9da054e..d6366be24d8 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
index cfd6bbf8b6c..107d63cfe7d 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006 - 2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp b/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp
index d03254e618b..a3ac4f28c46 100644
--- a/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp
+++ b/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 748442a3796..3f9d06d19a6 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ public:
Cage->SetGoState(GO_STATE_READY);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustSummoned(Creature* summoned) override
{
@@ -198,7 +198,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (Player* player = GetPlayerForEscort())
if (HasEscortState(STATE_ESCORT_PAUSED))
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 739e74e875f..ad1aec839bd 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -97,7 +97,7 @@ public:
me->SetStandState(UNIT_STAND_STATE_SLEEP);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* who) override
{
@@ -224,7 +224,7 @@ public:
me->SetUInt32Value(UNIT_NPC_FLAGS, NpcFlags);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(ATTACK_YELL, who);
}
@@ -306,7 +306,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -355,7 +355,7 @@ public:
_events.Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO, who);
}
@@ -499,7 +499,7 @@ public:
StartEvent();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void StartEvent()
{
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 9dfd78f52e9..6fa33522458 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
@@ -250,7 +250,7 @@ public:
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_UPPERCUT, 15 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_IMMOLATE, 10 * IN_MILLISECONDS);
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 33b7f161e39..6eefac95238 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index 172904e6c4f..2c0d90da9b2 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp
index 2521ceae801..0e51169749b 100644
--- a/src/server/scripts/Kalimdor/zone_felwood.cpp
+++ b/src/server/scripts/Kalimdor/zone_felwood.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index acd03e049dd..1f400bdd614 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -77,7 +77,7 @@ public:
}
}
- void EnterCombat(Unit* /*attacker*/) override
+ void JustEngagedWith(Unit* /*attacker*/) override
{
events.Reset();
events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000));
diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
index 15fa1a46ffd..6ca17c78bcb 100644
--- a/src/server/scripts/Kalimdor/zone_mulgore.cpp
+++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 14712535843..157e37dcbf9 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -683,7 +683,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*slayer*/) override;
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
index 3ed60b943cd..70eb58850f8 100644
--- a/src/server/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -160,7 +160,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void Reset() override { }
void UpdateAI(uint32 diff) override
@@ -246,7 +246,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_OOX_AGGRO);
}
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index f2e45de0c7a..d108f8859f6 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -151,7 +151,7 @@ public:
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
//not always use
if (rand32() % 4)
@@ -239,7 +239,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
index bf17d658c6e..b8dd6a17888 100644
--- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -85,7 +85,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoPlaySoundToSet(me, SOUND_AGGRO);
}
diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
index edf1e243dce..50bf7fe4f74 100644
--- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index b2b3e291dd1..907f4148b22 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index 5f0ecd6a595..14ab442369a 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index 32adc791162..29611c23cd9 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -144,9 +144,9 @@ class boss_high_priestess_azil : public CreatureScript
events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 40000);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
DoCast(me, SPELL_ENERGY_SHIELD);
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index c915846da3b..0ce55b6184d 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -91,9 +91,9 @@ class boss_ozruk : public CreatureScript
events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 13000);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
index 1074a39ea8a..cd34681aa33 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -140,9 +140,9 @@ class boss_slabhide : public CreatureScript
damage = me->GetHealth() - 1; // Let creature health fall to 1 hp but prevent it from dying during air phase.
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_HANDLE_ROCK_WALLS, 4000);
events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000));
diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
index c8624afa969..2207d089a63 100644
--- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
index ae06479e000..0596631e0dd 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.h b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
index d53a3eee7db..5396cd1942f 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.h
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Maelstrom/kezan.cpp b/src/server/scripts/Maelstrom/kezan.cpp
index 27e4cac6d83..814ac6371ac 100644
--- a/src/server/scripts/Maelstrom/kezan.cpp
+++ b/src/server/scripts/Maelstrom/kezan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Maelstrom/maelstrom_script_loader.cpp b/src/server/scripts/Maelstrom/maelstrom_script_loader.cpp
index d6a95dc101e..3b693ca6df4 100644
--- a/src/server/scripts/Maelstrom/maelstrom_script_loader.cpp
+++ b/src/server/scripts/Maelstrom/maelstrom_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h
index 970a64e1fd8..8443e1a125a 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
index 9f7f97a0cab..4a651769fd9 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -64,9 +64,9 @@ class boss_amanitar : public CreatureScript
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_ROOT, urand(5, 9) * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_BASH, urand(10, 14) * IN_MILLISECONDS);
@@ -190,7 +190,7 @@ public:
DoCast(me, SPELL_HEALTHY_MUSHROOM_POTENT_FUNGUS, true);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*victim*/) override { }
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index 242dd354a00..6017ba2c89a 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -78,9 +78,9 @@ class boss_elder_nadox : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_PLAGUE, 13 * IN_MILLISECONDS);
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
index 69980804071..b1423e8aa91 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -180,7 +180,7 @@ public:
me->SetControlled(false, UNIT_STATE_STUNNED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
index 8ee342db3a4..6c3427956af 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -116,7 +116,7 @@ public:
bFirstTime = false;
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!instance || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER))
return;
@@ -221,7 +221,7 @@ public:
AttackStart(target);
instance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0);
if (instance->GetBossState(DATA_JEDOGA_SHADOWSEEKER) != IN_PROGRESS)
- EnterCombat(target);
+ JustEngagedWith(target);
}
else if (!me->IsInCombat())
EnterEvadeMode();
@@ -399,7 +399,7 @@ public:
instance->SetGuidData(DATA_PL_JEDOGA_TARGET, killer->GetGUID());
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -534,7 +534,7 @@ public:
bool bCast2;
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*victim*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index 7e7a7d09b5e..19badd46a51 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -100,9 +100,9 @@ class boss_prince_taldaram : public CreatureScript
_embraceTakenDamage = 0;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_BLOODTHIRST, 10000);
events.ScheduleEvent(EVENT_VANISH, urand(25000, 35000));
@@ -304,12 +304,12 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript
_events.ScheduleEvent(EVENT_DESPAWN, 13 * IN_MILLISECONDS);
}
- void SetGUID(ObjectGuid guid, int32 /*id = 0*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_flameSphereTargetGUID = guid;
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
index be7b4cf4894..b30cc5c4b88 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
index 865b8e423e0..8a251b90d3e 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index 919f008c108..abdb09e1568 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -123,9 +123,9 @@ public:
bool CanAIAttack(Unit const* /*who*/) const override { return true; } // do not check boundary here
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
if (GameObject* door = instance->GetGameObject(DATA_ANUBARAK_WALL))
door->SetGoState(GO_STATE_ACTIVE); // open door for now
@@ -294,9 +294,9 @@ public:
Talk(SAY_SLAY);
}
- void SetGUID(ObjectGuid guid, int32 type) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- switch (type)
+ switch (id)
{
case GUID_TYPE_PET:
{
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 67973d32a34..dcddc1f2e65 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -223,7 +223,7 @@ public:
return BossAI::CanAIAttack(target);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_LEECH_POISON, randtime(Seconds(5), Seconds(7)));
events.ScheduleEvent(EVENT_ACID_CLOUD, randtime(Seconds(7), Seconds(13)));
@@ -269,7 +269,7 @@ public:
nerubian->DespawnOrUnsummon();
}
- void SetGUID(ObjectGuid guid, int32 /*what*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_anubar.push_back(guid);
}
@@ -444,7 +444,7 @@ struct npc_hadronox_crusherPackAI : public ScriptedAI
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (me->HasReactState(REACT_PASSIVE))
{
@@ -457,11 +457,11 @@ struct npc_hadronox_crusherPackAI : public ScriptedAI
other->AI()->AttackStart(who);
}
}
- _EnterCombat();
- ScriptedAI::EnterCombat(who);
+ _JustEngagedWith();
+ ScriptedAI::JustEngagedWith(who);
}
- virtual void _EnterCombat() = 0;
+ virtual void _JustEngagedWith() = 0;
virtual void DoEvent(uint32 /*eventId*/) = 0;
void MoveInLineOfSight(Unit* who) override
@@ -473,7 +473,7 @@ struct npc_hadronox_crusherPackAI : public ScriptedAI
}
if (me->CanStartAttack(who, false) && me->IsWithinDistInMap(who, me->GetAttackDistance(who) + me->m_CombatDistance))
- EnterCombat(who);
+ JustEngagedWith(who);
}
void UpdateAI(uint32 diff) override
@@ -519,7 +519,7 @@ class npc_anub_ar_crusher : public CreatureScript
{
npc_anub_ar_crusherAI(Creature* creature) : npc_hadronox_crusherPackAI(creature, crusherWaypoints), _hadFrenzy(false) { }
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_SMASH, randtime(Seconds(8), Seconds(12)));
@@ -603,7 +603,7 @@ class npc_anub_ar_crusher_champion : public CreatureScript
}
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_REND, randtime(Seconds(4), Seconds(8)));
_events.ScheduleEvent(EVENT_PUMMEL, randtime(Seconds(15), Seconds(19)));
@@ -646,7 +646,7 @@ class npc_anub_ar_crusher_crypt_fiend : public CreatureScript
}
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_CRUSHING_WEBS, randtime(Seconds(4), Seconds(8)));
_events.ScheduleEvent(EVENT_INFECTED_WOUND, randtime(Seconds(15), Seconds(19)));
@@ -689,7 +689,7 @@ class npc_anub_ar_crusher_necromancer : public CreatureScript
}
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_SHADOW_BOLT, randtime(Seconds(2), Seconds(4)));
_events.ScheduleEvent(EVENT_ANIMATE_BONES, randtime(Seconds(37), Seconds(45)));
@@ -847,7 +847,7 @@ class npc_anub_ar_champion : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_REND, randtime(Seconds(4), Seconds(8)));
_events.ScheduleEvent(EVENT_PUMMEL, randtime(Seconds(15), Seconds(19)));
@@ -889,7 +889,7 @@ class npc_anub_ar_crypt_fiend : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_CRUSHING_WEBS, randtime(Seconds(4), Seconds(8)));
_events.ScheduleEvent(EVENT_INFECTED_WOUND, randtime(Seconds(15), Seconds(19)));
@@ -931,7 +931,7 @@ class npc_anub_ar_necromancer : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SHADOW_BOLT, randtime(Seconds(2), Seconds(4)));
_events.ScheduleEvent(EVENT_ANIMATE_BONES, randtime(Seconds(37), Seconds(45)));
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 58f791e9a4d..b32dc1d4e45 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -180,7 +180,7 @@ class boss_krik_thir : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
_petsInCombat = false;
me->SetReactState(REACT_AGGRESSIVE);
@@ -190,7 +190,7 @@ class boss_krik_thir : public CreatureScript
events.ScheduleEvent(EVENT_SWARM, Seconds(5));
events.ScheduleEvent(EVENT_MIND_FLAY, randtime(Seconds(1), Seconds(3)));
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
}
void MoveInLineOfSight(Unit* who) override
@@ -202,7 +202,7 @@ class boss_krik_thir : public CreatureScript
}
if (me->CanStartAttack(who, false) && me->IsWithinDistInMap(who, me->GetAttackDistance(who) + me->m_CombatDistance))
- EnterCombat(who);
+ JustEngagedWith(who);
}
void EnterEvadeMode(EvadeReason /*why*/) override
@@ -326,8 +326,8 @@ struct npc_gatewatcher_petAI : public ScriptedAI
{
npc_gatewatcher_petAI(Creature* creature, bool isWatcher) : ScriptedAI(creature), _instance(creature->GetInstanceScript()), _petGroup(0), _isWatcher(isWatcher) { }
- virtual void _EnterCombat() = 0;
- void EnterCombat(Unit* who) override
+ virtual void _JustEngagedWith() = 0;
+ void JustEngagedWith(Unit* who) override
{
if (_isWatcher)
{
@@ -352,8 +352,8 @@ struct npc_gatewatcher_petAI : public ScriptedAI
if (Creature* summoner = meSummon->GetSummonerCreatureBase())
summoner->AI()->DoAction(ACTION_PET_ENGAGED);
}
- _EnterCombat();
- ScriptedAI::EnterCombat(who);
+ _JustEngagedWith();
+ ScriptedAI::JustEngagedWith(who);
}
void SetData(uint32 data, uint32 value) override
@@ -381,7 +381,7 @@ struct npc_gatewatcher_petAI : public ScriptedAI
}
if (me->CanStartAttack(who, false) && me->IsWithinDistInMap(who, me->GetAttackDistance(who) + me->m_CombatDistance))
- EnterCombat(who);
+ JustEngagedWith(who);
}
void SpellHit(Unit* /*whose*/, SpellInfo const* spell) override
@@ -423,7 +423,7 @@ class npc_watcher_gashra : public CreatureScript
_events.Reset();
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_ENRAGE, randtime(Seconds(3), Seconds(5)));
_events.ScheduleEvent(EVENT_WEB_WRAP, randtime(Seconds(16), Seconds(19)));
@@ -501,7 +501,7 @@ class npc_watcher_narjil : public CreatureScript
_events.Reset();
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_BLINDING_WEBS, randtime(Seconds(13), Seconds(18)));
_events.ScheduleEvent(EVENT_WEB_WRAP, randtime(Seconds(3), Seconds(5)));
@@ -579,7 +579,7 @@ class npc_watcher_silthik : public CreatureScript
_events.Reset();
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_POISON_SPRAY, randtime(Seconds(16), Seconds(19)));
_events.ScheduleEvent(EVENT_WEB_WRAP, randtime(Seconds(7), Seconds(11)));
@@ -655,7 +655,7 @@ class npc_anub_ar_warrior : public CreatureScript
_events.Reset();
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_CLEAVE, randtime(Seconds(7), Seconds(9)));
_events.ScheduleEvent(EVENT_STRIKE, randtime(Seconds(5), Seconds(10)));
@@ -715,7 +715,7 @@ class npc_anub_ar_skirmisher : public CreatureScript
_events.Reset();
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_ANUBAR_CHARGE, randtime(Seconds(6), Seconds(8)));
_events.ScheduleEvent(EVENT_BACKSTAB, randtime(Seconds(7), Seconds(9)));
@@ -783,7 +783,7 @@ class npc_anub_ar_shadowcaster : public CreatureScript
_events.Reset();
}
- void _EnterCombat() override
+ void _JustEngagedWith() override
{
_events.ScheduleEvent(EVENT_SHADOW_BOLT, Seconds(4));
_events.ScheduleEvent(EVENT_SHADOW_NOVA, randtime(Seconds(10), Seconds(14)));
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
index 03ba3b4b26c..cdeb2730c40 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index 88de9ff9d16..893987497cb 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -161,10 +161,10 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_SARTHARION_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
DoZoneInCombat();
FetchDragons();
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
index 4bdbee94db1..67063e471a4 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
index dc43b7f6a68..fa5359a9fd2 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -182,7 +182,7 @@ struct dummy_dragonAI : public ScriptedAI
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
@@ -424,9 +424,9 @@ public:
dummy_dragonAI::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- dummy_dragonAI::EnterCombat(who);
+ dummy_dragonAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_HATCH_EGGS, 30000);
}
@@ -492,9 +492,9 @@ public:
instance->SetBossState(DATA_PORTAL_OPEN, NOT_STARTED);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- dummy_dragonAI::EnterCombat(who);
+ dummy_dragonAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 60000);
}
@@ -563,9 +563,9 @@ public:
dummy_dragonAI::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- dummy_dragonAI::EnterCombat(who);
+ dummy_dragonAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 60000);
}
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
index 92331e8c8bf..2bf0ca7f8c5 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index b448ce1bda1..79d40b29f2e 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -105,10 +105,10 @@ class boss_baltharus_the_warborn : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->InterruptNonMeleeSpells(false);
- _EnterCombat();
+ _JustEngagedWith();
events.Reset();
events.SetPhase(PHASE_COMBAT);
events.ScheduleEvent(EVENT_CLEAVE, Seconds(13), 0, PHASE_COMBAT);
@@ -250,7 +250,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript
me->SetReactState(REACT_DEFENSIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
events.Reset();
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
index 6a3a185061b..4559cf170f4 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -83,9 +83,9 @@ class boss_general_zarithrian : public CreatureScript
return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE && BossAI::CanAIAttack(target));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CLEAVE, Seconds(8));
events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, Seconds(14));
@@ -189,7 +189,7 @@ class npc_onyx_flamecaller : public CreatureScript
MoveToGeneral();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_BLAST_NOVA, Seconds(17));
_events.ScheduleEvent(EVENT_LAVA_GOUT, Seconds(3));
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index 46a74d84114..e30194e2041 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -233,14 +233,14 @@ class boss_halion : public CreatureScript
controller->AI()->EnterEvadeMode(why);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.Reset();
events.SetPhase(PHASE_ONE);
- _EnterCombat();
+ _JustEngagedWith();
me->AddAura(SPELL_TWILIGHT_PRECISION, me);
events.ScheduleEvent(EVENT_ACTIVATE_FIREWALL, Seconds(5));
events.ScheduleEvent(EVENT_BREATH, randtime(Seconds(5), Seconds(15)));
@@ -410,11 +410,11 @@ class boss_twilight_halion : public CreatureScript
events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, Seconds(15));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.SetPhase(PHASE_TWO);
- _EnterCombat();
+ _JustEngagedWith();
me->AddAura(SPELL_TWILIGHT_PRECISION, me);
events.ScheduleEvent(EVENT_CLEAVE, Seconds(3));
events.ScheduleEvent(EVENT_BREATH, Seconds(12));
@@ -455,9 +455,9 @@ class boss_twilight_halion : public CreatureScript
void DamageTaken(Unit* attacker, uint32& damage) override
{
- //Needed because we already have UNIT_FLAG_IN_COMBAT, otherwise EnterCombat won't ever be called
+ //Needed because we already have UNIT_FLAG_IN_COMBAT, otherwise JustEngagedWith won't ever be called
if (!events.IsInPhase(PHASE_TWO) && !events.IsInPhase(PHASE_THREE))
- EnterCombat(attacker);
+ JustEngagedWith(attacker);
if (me->HealthBelowPctDamaged(50, damage) && events.IsInPhase(PHASE_TWO))
{
@@ -592,7 +592,7 @@ class npc_halion_controller : public CreatureScript
DoCastSelf(SPELL_CLEAR_DEBUFFS);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_twilightDamageTaken = 0;
_materialDamageTaken = 0;
@@ -1141,7 +1141,7 @@ class npc_meteor_strike_flame : public CreatureScript
SetCombatMovement(false);
}
- void SetGUID(ObjectGuid guid, int32 /*id = 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_rootOwnerGuid = guid;
_events.ScheduleEvent(EVENT_SPAWN_METEOR_FLAME, Milliseconds(800));
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
index 96d64012489..3804584a01a 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -84,9 +84,9 @@ class boss_saviana_ragefire : public CreatureScript
me->SetDisableGravity(false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.Reset();
events.ScheduleEvent(EVENT_ENRAGE, Seconds(20), EVENT_GROUP_LAND_PHASE);
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
index c9d68808c12..de4a1f16bec 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
index e9ed41f0fe9..df89c790d53 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
index 3d9c6c8f659..8c97b4a04b3 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index 663df7faf2a..20a22e301b8 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index 8e4400a2858..85238635302 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index ed63747a53f..124a39edda1 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -225,7 +225,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCastSpellShield();
}
@@ -637,7 +637,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
DoCast(me, SPELL_EARTH_SHIELD);
DoCast(who, SPELL_HEX_OF_MENDING);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
index d05c2c303a4..58ab85d0c79 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index 3bb4a121d6c..bd8b4f07d90 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
index d4be2f90f6e..c2b0031ba63 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 5e9d6515db6..ccc4714e874 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2010 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -267,9 +267,9 @@ class boss_anubarak_trial : public CreatureScript
summons.Summon(summoned);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -705,7 +705,7 @@ class npc_anubarak_spike : public CreatureScript
return victim->GetTypeId() == TYPEID_PLAYER;
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 9ca1dee21f3..3d5fbea4cb0 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -619,10 +619,10 @@ struct boss_faction_championsAI : public BossAI
pChampionController->AI()->SetData(2, DONE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_ANTI_AOE, true);
- _EnterCombat();
+ _JustEngagedWith();
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetGuidData(NPC_CHAMPIONS_CONTROLLER)))
pChampionController->AI()->SetData(2, IN_PROGRESS);
}
@@ -1241,9 +1241,9 @@ class npc_toc_warlock : public CreatureScript
SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- boss_faction_championsAI::EnterCombat(who);
+ boss_faction_championsAI::JustEngagedWith(who);
DoCast(SPELL_SUMMON_FELHUNTER);
}
@@ -1427,9 +1427,9 @@ class npc_toc_hunter : public CreatureScript
SetEquipmentSlots(false, 47156, EQUIP_NO_CHANGE, 48711);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- boss_faction_championsAI::EnterCombat(who);
+ boss_faction_championsAI::JustEngagedWith(who);
DoCast(SPELL_CALL_PET);
}
@@ -2060,9 +2060,9 @@ class npc_toc_retro_paladin : public CreatureScript
SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- boss_faction_championsAI::EnterCombat(who);
+ boss_faction_championsAI::JustEngagedWith(who);
DoCast(SPELL_SEAL_OF_COMMAND);
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 30a0138a689..16b0deafa7b 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2010 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -133,9 +133,9 @@ class boss_jaraxxus : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 99a87f981be..d2118ae3776 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2010 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -222,9 +222,9 @@ class boss_gormok : public CreatureScript
me->DespawnOrUnsummon();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS);
}
@@ -357,7 +357,7 @@ class npc_snobold_vassal : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 id) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
if (id == DATA_NEW_TARGET)
if (Unit* target = ObjectAccessor::GetPlayer(*me, guid))
@@ -558,9 +558,9 @@ struct boss_jormungarAI : public BossAI
me->DespawnOrUnsummon();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->SetInCombatWithZone();
instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_IN_PROGRESS);
}
@@ -961,9 +961,9 @@ class boss_icehowl : public CreatureScript
me->DespawnOrUnsummon();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS);
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 598caddd72f..a83e26ba740 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2010 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -262,7 +262,7 @@ struct boss_twin_baseAI : public BossAI
return ObjectAccessor::GetCreature((*me), instance->GetGuidData(SisterNpcId));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetInCombatWithZone();
if (Creature* pSister = GetSister())
@@ -408,12 +408,12 @@ class boss_fjola : public CreatureScript
boss_twin_baseAI::ExecuteEvent(eventId);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS);
me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN);
- boss_twin_baseAI::EnterCombat(who);
+ boss_twin_baseAI::JustEngagedWith(who);
}
void EnterEvadeMode(EvadeReason why) override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 4bf162838d0..ac86735c939 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 86b16216d97..a2165ffa604 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index 0b672e3c1fb..e98bbed7b92 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006 - 2010 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
index 58c7f780adb..91cd0546642 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -74,9 +74,9 @@ class boss_king_dred : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33000);
events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20000);
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 66c44c01019..4f08bd2db9a 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -102,9 +102,9 @@ public:
SetBubbled(false);
}
- void EnterCombat(Unit* /* victim */) override
+ void JustEngagedWith(Unit* /* victim */) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
SetCrystalsStatus(true);
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 00676a0a3c3..680103402e4 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -90,10 +90,10 @@ class boss_tharon_ja : public CreatureScript
me->RestoreDisplayId();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_DECAY_FLESH, 20000);
events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1000);
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 50bf88593c2..afed4d3be6d 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -89,9 +89,9 @@ class boss_trollgore : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CONSUME, 15000);
diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
index de016aed14e..bcbcb5cbe55 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
+++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
index 68ba3cb2591..a552a150b22 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index d3c57b45f76..f6d65a57189 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -91,9 +91,9 @@ class boss_bronjahm : public CreatureScript
DoCast(me, SPELL_SOULSTORM_CHANNEL, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL);
}
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 2b5224947ba..d6f51d41930 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -151,9 +151,9 @@ class boss_devourer_of_souls : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_FACE_AGGRO);
if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index ca15dec665e..c8c07cb01b8 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
index 897cd72ba50..786e6bc4e18 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index 2b6548bccc3..e1017b01bf3 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index 3128014ad51..278645a3d05 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -71,7 +71,7 @@ class boss_falric : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index b56301e8e65..28cfb3a0b74 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,7 +61,7 @@ class boss_marwyn : public CreatureScript
boss_horAI::Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index f0ecdc07dc4..ac80a42a9d6 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -1478,7 +1478,7 @@ class npc_ghostly_priest : public CreatureScript
{
npc_ghostly_priestAI(Creature* creature) : npc_gauntlet_trash(creature) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(6000, 15000));
_events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000);
@@ -1555,7 +1555,7 @@ class npc_phantom_mage : public CreatureScript
npc_gauntlet_trash::EnterEvadeMode(why);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_FIREBALL, 3000);
_events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000);
@@ -1656,7 +1656,7 @@ class npc_shadowy_mercenary : public CreatureScript
{
npc_shadowy_mercenaryAI(Creature* creature) : npc_gauntlet_trash(creature) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SHADOW_STEP, 23000);
_events.ScheduleEvent(EVENT_DEADLY_POISON, 5000);
@@ -1717,7 +1717,7 @@ class npc_spectral_footman : public CreatureScript
{
npc_spectral_footmanAI(Creature* creature) : npc_gauntlet_trash(creature) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 14000);
_events.ScheduleEvent(EVENT_SHIELD_BASH, 10000);
@@ -1771,7 +1771,7 @@ class npc_tortured_rifleman : public CreatureScript
{
npc_tortured_riflemanAI(Creature* creature) : npc_gauntlet_trash(creature) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SHOOT, 1);
_events.ScheduleEvent(EVENT_CURSED_ARROW, 7000);
@@ -1871,7 +1871,7 @@ class npc_frostsworn_general : public CreatureScript
_instance->SetData(DATA_FROSTSWORN_GENERAL, DONE);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
@@ -1957,7 +1957,7 @@ class npc_spiritual_reflection : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
_events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3000);
}
@@ -2593,7 +2593,7 @@ class npc_quel_delar_sword : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
_events.ScheduleEvent(EVENT_QUEL_DELAR_HEROIC_STRIKE, 4000);
_events.ScheduleEvent(EVENT_QUEL_DELAR_BLADESTORM, 6000);
@@ -2836,6 +2836,30 @@ class spell_hor_gunship_cannon_fire : public SpellScriptLoader
}
};
+// 70698 - Quel'Delar's Will
+class spell_hor_quel_delars_will : public SpellScript
+{
+ PrepareSpellScript(spell_hor_quel_delars_will);
+
+ bool Validate(SpellInfo const* spellInfo) override
+ {
+ return ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell });
+ }
+
+ void HandleReagent(SpellEffIndex effIndex)
+ {
+ PreventHitDefaultEffect(effIndex);
+
+ // dummy spell consumes reagent, don't ignore it
+ GetHitUnit()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST));
+ }
+
+ void Register() override
+ {
+ OnEffectHitTarget += SpellEffectFn(spell_hor_quel_delars_will::HandleReagent, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
+ }
+};
+
void AddSC_halls_of_reflection()
{
new at_hor_intro_start();
@@ -2862,4 +2886,5 @@ void AddSC_halls_of_reflection()
new spell_hor_start_halls_of_reflection_quest_ae();
new spell_hor_evasion();
new spell_hor_gunship_cannon_fire();
+ RegisterSpellScript(spell_hor_quel_delars_will);
}
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index 77f7d9d41a7..67032e2df6f 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 0cd5990beb1..2616c2d88a0 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index fc1395437c1..90e1f04ef74 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -100,9 +100,9 @@ class boss_garfrost : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
DoCast(me, SPELL_PERMAFROST);
me->CallForHelp(70.0f);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 270f4d0c700..07d96e5c27c 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -153,9 +153,9 @@ class boss_ick : public CreatureScript
return ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KRICK));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
if (Creature* krick = GetKrick())
krick->AI()->Talk(SAY_KRICK_AGGRO);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index cec1d885e73..06e53a95f59 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -157,7 +157,7 @@ class boss_tyrannus : public CreatureScript
return ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_RIMEFANG));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
@@ -334,9 +334,9 @@ class boss_rimefang : public CreatureScript
_EnterEvadeMode();
}
- void SetGUID(ObjectGuid guid, int32 type) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == GUID_HOARFROST)
+ if (id == GUID_HOARFROST)
{
_hoarfrostTargetGUID = guid;
_events.ScheduleEvent(EVENT_HOARFROST, 1000);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index 652aed172fc..e9f638bff7d 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 0e11e7f9089..22801f7fafd 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -56,7 +56,7 @@ class npc_ymirjar_flamebearer : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_FIREBALL, 4000);
_events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000);
@@ -127,7 +127,7 @@ class npc_iceborn_protodrake : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (Vehicle* _vehicle = me->GetVehicleKit())
_vehicle->RemoveAllPassengers();
@@ -181,7 +181,7 @@ class npc_geist_ambusher : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
return;
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
index 7d79e4a9c4c..11ff37700c3 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index 7af34da74bb..bf96ce3603a 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -115,9 +115,9 @@ class boss_drakkari_colossus : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->RemoveAura(SPELL_FREEZE_ANIM);
}
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index cb44a42450f..6f391e17f66 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,9 +65,9 @@ class boss_eck : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BITE, 5 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_SPIT, 10 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_SPRING, 8 * IN_MILLISECONDS);
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index 9d3dbd4e2dd..76e2cb065e1 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -111,9 +111,9 @@ class boss_gal_darah : public CreatureScript
_DespawnAtEvade();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
me->InterruptNonMeleeSpells(false);
SetPhase(PHASE_TROLL);
@@ -137,9 +137,9 @@ class boss_gal_darah : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 type /*= 0*/) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == DATA_SHARE_THE_LOVE)
+ if (id == DATA_SHARE_THE_LOVE)
{
if (Unit* target = ObjectAccessor::GetUnit(*me, guid))
Talk(EMOTE_IMPALE, target);
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index 22c023983b9..4d05f485c5f 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -85,9 +85,9 @@ class boss_moorabi : public CreatureScript
events.ScheduleEvent(EVENT_PHANTOM, Seconds(21), 0, PHASE_INTRO);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
DoCastSelf(SPELL_MOJO_FRENZY, true);
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 62d215f9161..b5162207d2a 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -105,9 +105,9 @@ public:
lWrappedPlayers.clear();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
@@ -184,9 +184,9 @@ public:
summons.Summon(summon);
}
- void SetGUID(ObjectGuid guid, int32 type) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES)
+ if (id == DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES)
lWrappedPlayers.insert(guid);
}
diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h
index 68de4c716c9..ec63e1dab3c 100644
--- a/src/server/scripts/Northrend/Gundrak/gundrak.h
+++ b/src/server/scripts/Northrend/Gundrak/gundrak.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
index c462827310f..469aa0d3fd2 100644
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index abc0d221627..ee9092c97ec 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -253,7 +253,7 @@ class boss_blood_council_controller : public CreatureScript
_DespawnAtEvade();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == IN_PROGRESS)
return;
@@ -451,7 +451,7 @@ struct BloodPrincesBossAI : public BossAI
instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(true));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetCombatPulseDelay(5);
me->setActive(true);
@@ -985,7 +985,7 @@ class npc_ball_of_flame : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 /*type*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_chaseGUID = guid;
}
@@ -1115,7 +1115,7 @@ class npc_dark_nucleus : public CreatureScript
DoCastSelf(SPELL_SHADOW_RESONANCE_AURA, true);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
_scheduler.Schedule(Seconds(1), [this](TaskContext targetAuraCheck)
{
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index e070829ea16..e6a842ea341 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -169,7 +169,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer()))
{
@@ -281,9 +281,9 @@ class boss_blood_queen_lana_thel : public CreatureScript
Talk(SAY_KILL);
}
- void SetGUID(ObjectGuid guid, int32 type = 0) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- switch (type)
+ switch (id)
{
case GUID_VAMPIRE:
_vampires.insert(guid);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index cea762cca39..75bdb596305 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -274,7 +274,7 @@ class boss_deathbringer_saurfang : public CreatureScript
me->RemoveAurasDueToSpell(SPELL_FRENZY);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (_dead)
return;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index e92b66f358f..8c2922efd14 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -111,7 +111,7 @@ class boss_festergut : public CreatureScript
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer()))
{
@@ -310,7 +310,7 @@ class npc_stinky_icc : public CreatureScript
_events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(3000, 7000));
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
DoCast(me, SPELL_PLAGUE_STENCH);
}
@@ -481,7 +481,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader
void Register() override
{
- OnEffectRemove += AuraEffectApplyFn(spell_festergut_blighted_spores_AuraScript::ExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
+ OnEffectRemove += AuraEffectRemoveFn(spell_festergut_blighted_spores_AuraScript::ExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index 16a3189ed32..35b5c3ba23d 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -799,7 +799,7 @@ class npc_gunship : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 id/* = 0*/) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
if (id != ACTION_SHIP_VISITS)
return;
@@ -868,7 +868,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
_rocketeersYellCooldown = time_t(0);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
_events.SetPhase(PHASE_COMBAT);
DoCast(me, _instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_FRIENDLY_BOSS_DAMAGE_MOD : SPELL_MELEE_TARGETING_ON_ORGRIMS_HAMMER, true);
@@ -1137,7 +1137,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
_mortarYellCooldown = time_t(0);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
_events.SetPhase(PHASE_COMBAT);
DoCast(me, _instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE ? SPELL_FRIENDLY_BOSS_DAMAGE_MOD : SPELL_MELEE_TARGETING_ON_SKYBREAKER, true);
@@ -1564,9 +1564,9 @@ class npc_gunship_boarding_leader : public CreatureScript
{
}
- void EnterCombat(Unit* target) override
+ void JustEngagedWith(Unit* target) override
{
- npc_gunship_boarding_addAI::EnterCombat(target);
+ npc_gunship_boarding_addAI::JustEngagedWith(target);
_events.ScheduleEvent(EVENT_BLADESTORM, urand(13000, 18000));
_events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(8000, 10000));
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 765b8717948..1c92cbc128f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -277,7 +277,7 @@ class boss_lady_deathwhisper : public CreatureScript
me->GetMotionMaster()->MoveChase(victim);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer()))
{
@@ -813,7 +813,7 @@ class npc_vengeful_shade : public CreatureScript
});
}
- void SetGUID(ObjectGuid guid, int32 /*type*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_targetGUID = guid;
}
@@ -905,7 +905,7 @@ class npc_darnavan : public CreatureScript
me->DespawnOrUnsummon();
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
Talk(SAY_DARNAVAN_AGGRO);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index d27ec7fb40b..66b3cc3a12a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -153,7 +153,7 @@ class boss_lord_marrowgar : public CreatureScript
_boneSpikeImmune.clear();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -305,9 +305,9 @@ class boss_lord_marrowgar : public CreatureScript
return ObjectGuid::Empty;
}
- void SetGUID(ObjectGuid guid, int32 type /*= 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- switch (type)
+ switch (id)
{
case DATA_COLDFLAME_GUID:
_coldflameTarget = guid;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 95996143209..736eb5201ca 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -245,7 +245,7 @@ class boss_professor_putricide : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT))
return;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index 21cb420cc5a..66d434b7704 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -115,7 +115,7 @@ class boss_rotface : public CreatureScript
infectionCooldown = 14000;
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer()))
{
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 446f9c4afa9..58eb328ddfb 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -261,7 +261,7 @@ class boss_sindragosa : public CreatureScript
}
- void EnterCombat(Unit* victim) override
+ void JustEngagedWith(Unit* victim) override
{
if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer()))
{
@@ -582,9 +582,9 @@ class npc_ice_tomb : public CreatureScript
me->SetReactState(REACT_PASSIVE);
}
- void SetGUID(ObjectGuid guid, int32 type/* = 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == DATA_TRAPPED_PLAYER)
+ if (id == DATA_TRAPPED_PLAYER)
{
_trappedPlayerGUID = guid;
_existenceCheckTimer = 1000;
@@ -865,7 +865,7 @@ class npc_rimefang : public CreatureScript
me->SetReactState(REACT_AGGRESSIVE);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
DoCast(me, SPELL_FROST_AURA_RIMEFANG, true);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 078b2dd5132..3b770c46f5a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -537,7 +537,7 @@ class boss_the_lich_king : public CreatureScript
me->GetMap()->SetZoneWeather(AREA_ICECROWN_CITADEL, WEATHER_STATE_FOG, 0.0f);
}
- void EnterCombat(Unit* target) override
+ void JustEngagedWith(Unit* target) override
{
if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer()))
{
@@ -1547,7 +1547,7 @@ class npc_valkyr_shadowguard : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 /* = 0*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_grabbedPlayer = guid;
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index cb9b9eeef78..717e2e2ace9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -364,7 +364,7 @@ class boss_valithria_dreamwalker : public CreatureScript
}
else if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) == NOT_STARTED)
if (Creature* archmage = me->FindNearestCreature(NPC_RISEN_ARCHMAGE, 30.0f))
- archmage->AI()->DoZoneInCombat(); // call EnterCombat on one of them, that will make it all start
+ archmage->AI()->DoZoneInCombat(); // call JustEngagedWith on one of them, that will make it all start
}
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -511,7 +511,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript
me->SetReactState(REACT_PASSIVE);
}
- void EnterCombat(Unit* target) override
+ void JustEngagedWith(Unit* target) override
{
if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer()))
{
@@ -619,7 +619,7 @@ class npc_the_lich_king_controller : public CreatureScript
me->setActive(false);
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
Talk(SAY_LICH_KING_INTRO);
me->setActive(true);
@@ -703,7 +703,7 @@ class npc_risen_archmage : public CreatureScript
void Initialize()
{
- _canCallEnterCombat = true;
+ _canCallJustEngagedWith = true;
}
bool CanAIAttack(Unit const* target) const override
@@ -720,10 +720,10 @@ class npc_risen_archmage : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
me->FinishSpell(CURRENT_CHANNELED_SPELL, false);
- if (me->GetSpawnId() && _canCallEnterCombat)
+ if (me->GetSpawnId() && _canCallJustEngagedWith)
{
std::list archmages;
RisenArchmageCheck check;
@@ -745,9 +745,9 @@ class npc_risen_archmage : public CreatureScript
if (action != ACTION_ENTER_COMBAT)
return;
- _canCallEnterCombat = false;
+ _canCallJustEngagedWith = false;
DoZoneInCombat();
- _canCallEnterCombat = true;
+ _canCallJustEngagedWith = true;
}
void JustSummoned(Creature* summon) override
@@ -802,7 +802,7 @@ class npc_risen_archmage : public CreatureScript
private:
EventMap _events;
InstanceScript* _instance;
- bool _canCallEnterCombat;
+ bool _canCallJustEngagedWith;
};
CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 067520caf08..113ec50a144 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -782,9 +782,9 @@ class boss_sister_svalna : public CreatureScript
}
}
- void EnterCombat(Unit* /*attacker*/) override
+ void JustEngagedWith(Unit* /*attacker*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE)))
crok->AI()->Talk(SAY_CROK_COMBAT_SVALNA);
DoCastSelf(SPELL_DIVINE_SURGE, true);
@@ -1015,9 +1015,9 @@ class npc_crok_scourgebane : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 type/* = 0*/) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == ACTION_VRYKUL_DEATH)
+ if (id == ACTION_VRYKUL_DEATH)
{
_aliveTrash.erase(guid);
if (_aliveTrash.empty())
@@ -1287,7 +1287,7 @@ struct npc_argent_captainAI : public ScriptedAI
}
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
me->SetHomePosition(*me);
if (IsUndead)
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
index 94a0a21bc7f..ed723bbfe9d 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
index 571de70bc0a..aa73f9b95a8 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index c674d1bfdf0..004ec13e8d1 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
index 78697f32387..ed16b6728ac 100644
--- a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
+++ b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,7 +60,7 @@ public:
(*itr)->Respawn();
};
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_DAGGER_THROW, 7 * IN_MILLISECONDS);
diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
index 1fabeb878eb..44890768246 100644
--- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
+++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index 9df479f51c9..4a373102b70 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -154,9 +154,9 @@ public:
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
summons.DoZoneInCombat();
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
index db1f7975e8b..5b3a7d53c84 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -95,9 +95,9 @@ class boss_faerlina : public CreatureScript
SummonAdds();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
summons.DoZoneInCombat();
events.ScheduleEvent(EVENT_POISON, randtime(Seconds(10), Seconds(15)));
@@ -214,7 +214,7 @@ class npc_faerlina_add : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* faerlina = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FAERLINA)))
faerlina->AI()->DoZoneInCombat(nullptr, 250.0f);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index ad304c711cf..4e3ec1bd149 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -284,7 +284,7 @@ struct boss_four_horsemen_baseAI : public BossAI
DoCastAOE(SPELL_ENCOUNTER_CREDIT, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (instance->GetBossState(BOSS_HORSEMEN) == IN_PROGRESS || instance->GetBossState(BOSS_HORSEMEN) == DONE) // another horseman already did it
return;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index 12c89d119b3..4039cbc6345 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -106,9 +106,9 @@ public:
me->SetSpeed(UnitMoveType::MOVE_RUN, 12.0f / baseMoveSpeed[MOVE_RUN]);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_WOUND, Seconds(10));
events.ScheduleEvent(EVENT_ENRAGE, randtime(Seconds(16), Seconds(22)));
events.ScheduleEvent(EVENT_DECIMATE, randtime(Minutes(1)+Seconds(50), Minutes(2)));
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 9fcb35b269b..e6a919fc97f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -320,9 +320,9 @@ class boss_gothik : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.SetPhase(PHASE_ONE);
events.ScheduleEvent(EVENT_SUMMON, Seconds(25), 0, PHASE_ONE);
events.ScheduleEvent(EVENT_DOORS_UNLOCK, Minutes(3) + Seconds(25), 0, PHASE_ONE);
@@ -896,7 +896,7 @@ public:
void EnterEvadeMode(EvadeReason /*why*/) override { }
void UpdateAI(uint32 /*diff*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* /*who*/, uint32& damage) override { damage = 0; }
Creature* SelectRandomSkullPile()
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 914db8461d4..87c6051a661 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -54,9 +54,9 @@ class boss_grobbulus : public CreatureScript
{
boss_grobbulusAI(Creature* creature) : BossAI(creature, BOSS_GROBBULUS) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CLOUD, Seconds(15));
events.ScheduleEvent(EVENT_INJECT, Seconds(20));
events.ScheduleEvent(EVENT_SPRAY, randtime(Seconds(15), Seconds(30))); // not sure
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index 5b408dafbf2..9da47b40cbd 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -110,9 +110,9 @@ public:
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
_safeSection = 0;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index d3108155b2f..3b2b3a6f505 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -593,7 +593,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI
kelThuzad->AI()->EnterEvadeMode(EVADE_REASON_OTHER);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
_movementTimer = 0; // once it's zero, it'll never get checked again
if (!me->HasReactState(REACT_PASSIVE))
@@ -615,7 +615,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI
}
me->SetReactState(REACT_AGGRESSIVE);
AttackStart(who);
- ScriptedAI::EnterCombat(who);
+ ScriptedAI::JustEngagedWith(who);
}
void AttackStart(Unit* who) override
@@ -632,7 +632,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI
}
if (me->CanStartAttack(who, false) && me->GetDistance2d(who) <= MINION_AGGRO_DISTANCE)
- EnterCombat(who);
+ JustEngagedWith(who);
}
void SetData(uint32 data, uint32 value) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 0506d85faa3..de9a47d8b58 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -71,9 +71,9 @@ class boss_loatheb : public CreatureScript
_sporeLoser = true;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_NECROTIC_AURA, Seconds(17));
events.ScheduleEvent(EVENT_DEATHBLOOM, Seconds(5));
events.ScheduleEvent(EVENT_SPORE, Seconds(18));
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
index d513a4e1583..42f04344e07 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -100,9 +100,9 @@ public:
{
boss_maexxnaAI(Creature* creature) : BossAI(creature, BOSS_MAEXXNA) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_WRAP, Seconds(20));
events.ScheduleEvent(EVENT_SPRAY, Seconds(40));
events.ScheduleEvent(EVENT_SHOCK, randtime(Seconds(5), Seconds(10)));
@@ -209,7 +209,7 @@ public:
me->SetVisible(false);
}
- void SetGUID(ObjectGuid guid, int32 /*param*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
if (!guid)
return;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index daf9aba31bc..09904dd9bbd 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -114,9 +114,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
EnterPhaseGround();
}
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index 6c5ba318354..e26edfdce1f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -92,9 +92,9 @@ public:
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Enraged = false;
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_HATEFUL, Seconds(1));
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
index 51eb68b6eed..067d548828a 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -114,9 +114,9 @@ public:
instance->SetBossState(BOSS_RAZUVIOUS, DONE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->StopMoving();
summons.DoZoneInCombat();
Talk(SAY_AGGRO);
@@ -182,7 +182,7 @@ class npc_dk_understudy : public CreatureScript
creature->LoadEquipment(1);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
if (Creature* razuvious = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_RAZUVIOUS)))
@@ -219,7 +219,7 @@ class npc_dk_understudy : public CreatureScript
if (apply)
{
if (!me->IsInCombat())
- EnterCombat(nullptr);
+ JustEngagedWith(nullptr);
me->StopMoving();
me->SetReactState(REACT_PASSIVE);
_charmer = me->GetCharmerGUID();
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index d97cc9fa590..74da0607518 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -170,9 +170,9 @@ class boss_sapphiron : public CreatureScript
damage = me->GetHealth()-1; // don't die during air phase
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->CastSpell(me, SPELL_FROST_AURA, true);
@@ -436,9 +436,9 @@ struct npc_sapphiron_blizzard : public ScriptedAI
return data == DATA_BLIZZARD_TARGET ? _targetGuid : ObjectGuid::Empty;
}
- void SetGUID(ObjectGuid guid, int32 data) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (data == DATA_BLIZZARD_TARGET)
+ if (id == DATA_BLIZZARD_TARGET)
_targetGuid = guid;
}
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index ea86b885230..77d47b892d4 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -595,7 +595,7 @@ public:
Talk(SAY_STALAGG_SLAY);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_STALAGG_AGGRO);
@@ -865,7 +865,7 @@ public:
Talk(SAY_FEUGEN_SLAY);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_FEUGEN_AGGRO);
@@ -1028,7 +1028,7 @@ public:
void EnterEvadeMode(EvadeReason /*why*/) override { } // never stop casting due to evade
void UpdateAI(uint32 /*diff*/) override { } // never do anything unless told
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* /*who*/, uint32& damage) override { damage = 0; } // no, you can't kill it
};
};
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 8eccf5cce68..2d46e7403ab 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
index 64e313fea59..99dc0e54dc3 100644
--- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h
+++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 5a0177cf03a..fc56b5b90ff 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -430,9 +430,9 @@ public:
return ObjectGuid::Empty;
}
- void SetGUID(ObjectGuid guid, int32 type) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- switch (type)
+ switch (id)
{
case DATA_LAST_OVERLOAD_GUID:
_arcaneOverloadGUID = guid;
@@ -440,7 +440,7 @@ public:
case DATA_FIRST_SURGE_TARGET_GUID:
case DATA_FIRST_SURGE_TARGET_GUID + 1:
case DATA_FIRST_SURGE_TARGET_GUID + 2:
- _surgeTargetGUID[type - DATA_FIRST_SURGE_TARGET_GUID] = guid;
+ _surgeTargetGUID[id - DATA_FIRST_SURGE_TARGET_GUID] = guid;
break;
case DATA_LAST_TARGET_BARRAGE_GUID:
_lastHitByArcaneBarrageGUID = guid;
@@ -563,7 +563,7 @@ public:
BossAI::AttackStart(target);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
// We can't call full function here since it includes DoZoneInCombat(),
// if someone does it will be returned with a warning.
@@ -1414,7 +1414,7 @@ class npc_scion_of_eternity : public CreatureScript
_events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(14, 29)*IN_MILLISECONDS);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
index e06b5c1023e..c0c86663441 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index 509082206e4..96e76dc4867 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index e8c5da8d76e..394f46b160c 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -103,7 +103,7 @@ class boss_anomalus : public CreatureScript
instance->SetBossState(DATA_ANOMALUS, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
index c8c80ed9d19..dd313431371 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 6f02f9abf19..476a98806ca 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -89,11 +89,11 @@ class boss_keristrasza : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoCastAOE(SPELL_INTENSE_COLD);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14000);
events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, DUNGEON_MODE(30000, 11000));
@@ -148,7 +148,7 @@ class boss_keristrasza : public CreatureScript
}
}
- void SetGUID(ObjectGuid guid, int32 id/* = 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
if (id == DATA_INTENSE_COLD)
_intenseColdList.push_back(guid);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 26a427dbbe6..90b7bdf37c7 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -140,7 +140,7 @@ public:
me->AddAura(SPELL_WEAR_CHRISTMAS_HAT, me);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp
index 935d309eb02..81a5bb1cb5c 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,9 +51,9 @@ class boss_nexus_commanders : public CreatureScript
{
boss_nexus_commandersAI(Creature* creature) : BossAI(creature, DATA_COMMANDER) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON);
DoCast(me, SPELL_BATTLE_SHOUT);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 950ba5d91f7..3fba12c3f4b 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -84,9 +84,9 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12000);
events.ScheduleEvent(EVENT_TRAMPLE, 10000);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index dcb1886e818..434aa33b83f 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
index c4b07c78c3b..acaaeae95f1 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
+++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 90eeafb407b..5cdd04f4967 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -78,9 +78,9 @@ class boss_drakos : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index c5a1a95b2f8..b4d76e076c5 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -113,9 +113,9 @@ class boss_eregos : public CreatureScript
Talk(SAY_KILL);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
/* Checks for present drakes vehicles from each type and deactivate achievement that corresponds to each found
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index b07c0f22169..ca994d71e51 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -127,9 +127,9 @@ class boss_urom : public CreatureScript
me->GetMotionMaster()->MoveIdle();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
StartAttack();
}
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
index 7865ffaec8d..292ddd80042 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -89,9 +89,9 @@ class boss_varos : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 647f2ffc716..366f1fddb63 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
index 9fa184da932..9f9fd33fe97 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
index 94931e9dae0..1eab4132f22 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index 65991267f63..025c16af442 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -197,7 +197,7 @@ public:
ScriptedAI::EnterEvadeMode(why);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -419,7 +419,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (Creature* pBjarngrim = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_BJARNGRIM)))
{
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index aadab9f1d29..88ed842d2b0 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@ public:
instance->SetBossState(DATA_IONAR, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 3cd470d1a37..96fd48cc4c4 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -100,9 +100,9 @@ public:
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15000);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index c0c2998f874..4d98f87c116 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -119,14 +119,14 @@ public:
events.ScheduleEvent(EVENT_FORGE_CAST, 2 * IN_MILLISECONDS, 0, PHASE_INTRO);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_PAUSE, 3.5 * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_SHATTERING_STOMP, 0 * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_SHATTER, 5 * IN_MILLISECONDS, 0, PHASE_NORMAL);
- _EnterCombat();
+ _JustEngagedWith();
}
void AttackStart(Unit* who) override
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
index 2cbbd8556b6..22df062831e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index 0782a552bc4..937f2372e1e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 4674984d8c3..ae664ceae1b 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -62,10 +62,10 @@ class boss_krystallus : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(3000, 9000));
events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000));
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index 692875c496c..f29ab70962e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,9 +70,9 @@ class boss_maiden_of_grief : public CreatureScript
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index 47fc35d6207..e3fae84a7ea 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -92,7 +92,7 @@ class boss_sjonnir : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_SJONNIR, who->ToPlayer()))
{
@@ -100,7 +100,7 @@ class boss_sjonnir : public CreatureScript
return;
}
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(3000, 8000));
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index c9b83d7e010..1e772f9d626 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
index 69042bf18f4..3665ef44475 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index 7609a8518c8..4e3c66a09ca 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
index f62f7ec51f9..aea63dff768 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -386,7 +386,7 @@ class boss_algalon_the_observer : public CreatureScript
return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1;
}
- void EnterCombat(Unit* /*target*/) override
+ void JustEngagedWith(Unit* /*target*/) override
{
uint32 introDelay = 0;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC);
@@ -396,7 +396,7 @@ class boss_algalon_the_observer : public CreatureScript
if (!_firstPull)
{
Talk(SAY_ALGALON_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
introDelay = 8000;
}
else
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
index fe6565664fa..307e5e4e806 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -157,9 +157,9 @@ class boss_steelbreaker : public CreatureScript
me->RemoveAllAuras();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_STEELBREAKER_AGGRO);
DoCast(me, SPELL_HIGH_VOLTAGE);
events.SetPhase(++phase);
@@ -305,9 +305,9 @@ class boss_runemaster_molgeim : public CreatureScript
me->RemoveAllAuras();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_MOLGEIM_AGGRO);
events.SetPhase(++phase);
events.ScheduleEvent(EVENT_BERSERK, 900000);
@@ -484,9 +484,9 @@ class boss_stormcaller_brundir : public CreatureScript
return 0;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_BRUNDIR_AGGRO);
events.SetPhase(++phase);
events.ScheduleEvent(EVENT_MOVE_POSITION, 1000);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index 392fe54be39..8d965924d78 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -124,9 +124,9 @@ class boss_auriaya : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000));
@@ -346,7 +346,7 @@ class npc_sanctum_sentry : public CreatureScript
events.ScheduleEvent(EVENT_POUNCE, urand(12000, 15000));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_STRENGHT_PACK, true);
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index 412295a664b..8dd67e1ff5e 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -273,9 +273,9 @@ class boss_flame_leviathan : public CreatureScript
me->SetReactState(REACT_DEFENSIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->SetReactState(REACT_PASSIVE);
events.ScheduleEvent(EVENT_PURSUE, 1);
events.ScheduleEvent(EVENT_MISSILE, urand(1500, 4*IN_MILLISECONDS));
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index bc105a0422e..5d1a3fb8543 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -335,9 +335,9 @@ class boss_freya : public CreatureScript
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- _EnterCombat();
+ _JustEngagedWith();
DoZoneInCombat();
Creature* Elder[3];
for (uint8 n = 0; n < 3; ++n)
@@ -723,9 +723,9 @@ class boss_elder_brightleaf : public CreatureScript
Talk(SAY_ELDER_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
if (!me->HasAura(SPELL_DRAINED_OF_POWER))
Talk(SAY_ELDER_AGGRO);
}
@@ -824,9 +824,9 @@ class boss_elder_stonebark : public CreatureScript
Talk(SAY_ELDER_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
if (!me->HasAura(SPELL_DRAINED_OF_POWER))
Talk(SAY_ELDER_AGGRO);
}
@@ -931,9 +931,9 @@ class boss_elder_ironbranch : public CreatureScript
Talk(SAY_ELDER_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
if (!me->HasAura(SPELL_DRAINED_OF_POWER))
Talk(SAY_ELDER_AGGRO);
}
@@ -1281,7 +1281,7 @@ class npc_ancient_conservator : public CreatureScript
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
DoCast(who, SPELL_CONSERVATOR_GRIP, true);
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
index 00370d87516..4670e062ab5 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -128,9 +128,9 @@ class boss_general_vezax : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
DoCast(me, SPELL_AURA_OF_DESPAIR);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 59b9cc5bcb1..feef62901b2 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -355,9 +355,9 @@ class boss_hodir : public CreatureScript
FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
DoCast(me, SPELL_BITING_COLD, true);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
index 7aa60e8af68..664fdec748d 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -139,9 +139,9 @@ class boss_ignis : public CreatureScript
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_JET, 30000);
events.ScheduleEvent(EVENT_SCORCH, 25000);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index 33e97e8baf6..660b52d9b6f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -114,7 +114,7 @@ class boss_kologarn : public CreatureScript
bool left, right;
ObjectGuid eyebeamTarget;
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -130,7 +130,7 @@ class boss_kologarn : public CreatureScript
if (Unit* arm = vehicle->GetPassenger(i))
arm->ToCreature()->SetInCombatWithZone();
- _EnterCombat();
+ _JustEngagedWith();
}
void Reset() override
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index 0a1131e713c..ece8443c6d0 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -417,12 +417,12 @@ class boss_mimiron : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (!me->GetVehicleBase())
return;
- _EnterCombat();
+ _JustEngagedWith();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->RemoveAurasDueToSpell(SPELL_WELD);
DoCast(me->GetVehicleBase(), SPELL_SEAT_6);
@@ -1275,7 +1275,7 @@ class npc_mimiron_assault_bot : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_MAGNETIC_FIELD, 14000);
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index bbdb223a0d3..d877752b200 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -379,9 +379,9 @@ class boss_razorscale : public CreatureScript
commander->AI()->DoAction(ACTION_COMMANDER_RESET);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
if (Creature* controller = instance->GetCreature(DATA_RAZORSCALE_CONTROL))
controller->AI()->DoAction(ACTION_HARPOON_BUILD);
me->SetSpeedRate(MOVE_FLIGHT, 3.0f);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index 0dc4e553ad7..cc16588c3ba 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -500,9 +500,9 @@ class boss_thorim : public CreatureScript
_DespawnAtEvade();
}
- void SetGUID(ObjectGuid guid, int32 type) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
- if (type == DATA_CHARGED_PILLAR)
+ if (id == DATA_CHARGED_PILLAR)
{
_activePillarGUID = guid;
@@ -605,9 +605,9 @@ class boss_thorim : public CreatureScript
SetBoundary(&ArenaBoundaries);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO_1);
events.SetPhase(PHASE_1);
@@ -1249,7 +1249,7 @@ class npc_thorim_arena_phase : public CreatureScript
_events.ScheduleEvent(EVENT_ABILITY_CHARGE, 8000);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (_info->Type == DARK_RUNE_WARBRINGER)
DoCast(me, SPELL_AURA_OF_CELERITY);
@@ -1420,7 +1420,7 @@ class npc_runic_colossus : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
_events.Reset();
@@ -1507,7 +1507,7 @@ class npc_ancient_rune_giant : public CreatureScript
me->SummonCreature(s.entry, s.pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
_events.Reset();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 863740fa70f..8e078e2419b 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -210,10 +210,10 @@ class boss_xt002 : public CreatureScript
_DespawnAtEvade();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_ENRAGE, TIMER_ENRAGE);
events.ScheduleEvent(EVENT_GRAVITY_BOMB, TIMER_GRAVITY_BOMB);
@@ -749,7 +749,7 @@ class npc_life_spark : public CreatureScript
_scheduler.CancelAll();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCastSelf(SPELL_STATIC_CHARGED);
_scheduler.Schedule(Seconds(12), [this](TaskContext spellShock)
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
index 38979ecd66b..2f56df7406d 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,12 +16,21 @@
*/
#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "PassiveAI.h"
-#include "SpellScript.h"
-#include "SpellAuraEffects.h"
-#include "MoveSplineInit.h"
#include "CreatureTextMgr.h"
+#include "GridNotifiers.h"
+#include "InstanceScript.h"
+#include "Map.h"
+#include "MotionMaster.h"
+#include "MoveSplineInit.h"
+#include "ObjectAccessor.h"
+#include "PassiveAI.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "Spell.h"
+#include "SpellAuraEffects.h"
+#include "SpellMgr.h"
+#include "SpellScript.h"
+#include "TemporarySummon.h"
#include "ulduar.h"
enum Yells
@@ -500,7 +509,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* sara = instance->GetCreature(DATA_SARA))
sara->SetInCombatWith(me);
@@ -753,7 +762,7 @@ class boss_sara : public CreatureScript
Talk(SAY_SARA_KILL);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_SARA_AGGRO);
_events.ScheduleEvent(EVENT_SARAS_FERVOR, 5000, 0, PHASE_ONE);
@@ -1298,7 +1307,7 @@ class npc_constrictor_tentacle : public CreatureScript
void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override
{
if (!apply)
- passenger->RemoveAurasDueToSpell(SPELL_SQUEEZE);
+ passenger->RemoveAurasDueToSpell(sSpellMgr->GetSpellIdForDifficulty(SPELL_SQUEEZE, passenger));
}
void UpdateAI(uint32 /*diff*/) override
@@ -1596,7 +1605,7 @@ class npc_yogg_saron_keeper : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
switch (me->GetEntry())
{
@@ -2426,7 +2435,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131
}
};
-class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125
+class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125, 64126
{
public:
spell_yogg_saron_squeeze() : SpellScriptLoader("spell_yogg_saron_squeeze") { }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index d662578b9d5..2280a176d97 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
index 15964534640..ad8197e5df0 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 7eb24fb5dd4..b5822a294e2 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -149,11 +149,11 @@ class boss_ingvar_the_plunderer : public CreatureScript
events.ScheduleEvent(EVENT_JUST_TRANSFORMED, IN_MILLISECONDS / 2, 0, PHASE_EVENT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- if (events.IsInPhase(PHASE_EVENT) || events.IsInPhase(PHASE_UNDEAD)) // ingvar gets multiple EnterCombat calls
+ if (events.IsInPhase(PHASE_EVENT) || events.IsInPhase(PHASE_UNDEAD)) // ingvar gets multiple JustEngagedWith calls
return;
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.SetPhase(PHASE_HUMAN);
@@ -325,7 +325,7 @@ class npc_annhylde_the_caller : public CreatureScript
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index 7e732e9bc60..373a6d8eaa1 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -135,9 +135,9 @@ class boss_keleseth : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_START_COMBAT);
if (!who)
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index 27da9c2e8bf..487f2893815 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -108,10 +108,10 @@ struct generic_boss_controllerAI : public BossAI
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (!IsInGhostForm)
- _EnterCombat();
+ _JustEngagedWith();
}
void JustDied(Unit* /*killer*/) override
@@ -185,9 +185,9 @@ class boss_skarvald_the_constructor : public CreatureScript
generic_boss_controllerAI::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- generic_boss_controllerAI::EnterCombat(who);
+ generic_boss_controllerAI::JustEngagedWith(who);
if (!IsInGhostForm)
Talk(SAY_AGGRO);
@@ -245,9 +245,9 @@ class boss_dalronn_the_controller : public CreatureScript
OtherBossData = DATA_SKARVALD;
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- generic_boss_controllerAI::EnterCombat(who);
+ generic_boss_controllerAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000);
events.ScheduleEvent(EVENT_DEBILITATE, 5000);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index ed8f349edd6..6097521b0b9 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index c5a0000fd81..d175b13ffbc 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -67,7 +67,7 @@ class npc_dragonflayer_forge_master : public CreatureScript
_instance->SetData(DATA_FORGE_1 + _forgeId - 1, DONE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (!_forgeId)
_forgeId = GetForgeMasterType();
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
index 81a357e4cff..2fc8b6e8940 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index dead19a90a2..b2b5364e087 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -215,9 +215,9 @@ public:
_orb = summon->GetGUID();
}
- void EnterCombat (Unit* /*who*/) override
+ void JustEngagedWith (Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_ARCING_SMASH, Seconds(7));
events.ScheduleEvent(EVENT_IMPALE, Seconds(11));
@@ -329,7 +329,7 @@ struct PalehoofMinionsBossAI : public BossAI
DoCastSelf(SPELL_FREEZE, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetCombatPulseDelay(5);
me->setActive(true);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 9ed7f76d9ac..578637611ee 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -471,9 +471,9 @@ struct npc_skadi_trashAI : public ScriptedAI
});
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- CreatureAI::EnterCombat(who);
+ CreatureAI::JustEngagedWith(who);
ScheduleTasks();
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 7eff09338fc..3c4b3330193 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -165,9 +165,9 @@ class boss_svala : public CreatureScript
instance->SetGuidData(DATA_SACRIFICED_PLAYER, ObjectGuid::Empty);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index a55ddfa6bdd..a4e4f8249c4 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -135,9 +135,9 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_BANE, urand(18000, 23000), EVENT_GROUP_BASE_SPELLS);
events.ScheduleEvent(EVENT_FETID_ROT, urand(8000, 13000), EVENT_GROUP_BASE_SPELLS);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
index 2afe31455ce..b92f6ddf108 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
index a2d5004c6e8..b4731a87650 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
index 71ee6285074..59c9bc7d3dc 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -76,14 +76,14 @@ class boss_archavon : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000);
events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000);
events.ScheduleEvent(EVENT_STOMP, 45000);
events.ScheduleEvent(EVENT_BERSERK, 300000);
- _EnterCombat();
+ _JustEngagedWith();
}
// Below UpdateAI may need review/debug.
@@ -166,7 +166,7 @@ class npc_archavon_warder : public CreatureScript
events.ScheduleEvent(EVENT_WHIRL, 7500);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
index 20a86e2c8f7..042a473f0e0 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -97,7 +97,7 @@ class boss_emalon : public CreatureScript
summoned->AI()->AttackStart(me->GetVictim());
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (!summons.empty())
{
@@ -114,7 +114,7 @@ class boss_emalon : public CreatureScript
events.ScheduleEvent(EVENT_BERSERK, 360000);
events.ScheduleEvent(EVENT_OVERCHARGE, 45000);
- _EnterCombat();
+ _JustEngagedWith();
}
void UpdateAI(uint32 diff) override
@@ -214,7 +214,7 @@ class npc_tempest_minion : public CreatureScript
}
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
DoZoneInCombat();
events.ScheduleEvent(EVENT_SHOCK, 20000);
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
index 6141c2167d4..0ef5645b2c6 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,7 +61,7 @@ class boss_koralon : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_BURNING_FURY);
@@ -70,7 +70,7 @@ class boss_koralon : public CreatureScript
events.ScheduleEvent(EVENT_METEOR_FISTS, 75000); // 1st after 75sec, then every 45sec
events.ScheduleEvent(EVENT_FLAME_CINDER, 30000); /// @todo check timer
- _EnterCombat();
+ _JustEngagedWith();
}
void UpdateAI(uint32 diff) override
@@ -140,7 +140,7 @@ class npc_flame_warder : public CreatureScript
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
index 9d80dc64a1a..ede24ae8f53 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,7 +65,7 @@ class boss_toravon : public CreatureScript
{
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_FROZEN_MALLET);
@@ -73,7 +73,7 @@ class boss_toravon : public CreatureScript
events.ScheduleEvent(EVENT_WHITEOUT, 13000);
events.ScheduleEvent(EVENT_FREEZING_GROUND, 15000);
- _EnterCombat();
+ _JustEngagedWith();
}
void UpdateAI(uint32 diff) override
@@ -138,7 +138,7 @@ class npc_frost_warder : public CreatureScript
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
@@ -202,7 +202,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
index a3bac4f39dd..16e972a5ef7 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
index 3af77979c68..750e7c4649e 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
+++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index ebcc48f5ed8..99fcf9cfd34 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,9 +51,9 @@ class boss_cyanigosa : public CreatureScript
{
boss_cyanigosaAI(Creature* creature) : BossAI(creature, DATA_CYANIGOSA) { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index 1bc7223f08e..964ee11d948 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,9 +65,9 @@ class boss_erekem : public CreatureScript
me->SetCanDualWield(false);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
DoCast(me, SPELL_EARTH_SHIELD);
}
@@ -268,7 +268,7 @@ class npc_erekem_guard : public CreatureScript
scheduler.CancelAll();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index 3ce72ebd74f..4450dfe98d5 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -98,9 +98,9 @@ class boss_ichoron : public CreatureScript
DoCast(me, SPELL_THREAT_PROC, true);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
index 1a25a0b69fe..9309276f05c 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -41,9 +41,9 @@ class boss_lavanthor : public CreatureScript
BossAI::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
}
void JustReachedHome() override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index cc1e96f78b2..bfaf7d972b1 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -48,9 +48,9 @@ class boss_moragg : public CreatureScript
BossAI::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
}
void JustReachedHome() override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index 367ab44b466..4d00e558e45 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -89,9 +89,9 @@ class boss_xevozz : public CreatureScript
BossAI::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index f26ca430538..fec65477106 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,9 +70,9 @@ class boss_zuramat : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- BossAI::EnterCombat(who);
+ BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index a956c11c11b..64178c66a3a 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index f5e962117e1..2affe94ef2d 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -655,7 +655,7 @@ struct npc_violet_hold_teleportation_portal_commonAI : public ScriptedAI
void MoveInLineOfSight(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustSummoned(Creature* summon) override
{
@@ -916,9 +916,9 @@ struct violet_hold_trashAI : public npc_escortAI
CreatureStartAttackDoor();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- npc_escortAI::EnterCombat(who);
+ npc_escortAI::JustEngagedWith(who);
ScheduledTasks();
}
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
index 537c5d51b1e..17ab4da834e 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/northrend_script_loader.cpp b/src/server/scripts/Northrend/northrend_script_loader.cpp
index e3c5fb720a1..93e1d1f9d9e 100644
--- a/src/server/scripts/Northrend/northrend_script_loader.cpp
+++ b/src/server/scripts/Northrend/northrend_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index a98a76ea356..56870ec2ba4 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -100,7 +100,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -360,7 +360,7 @@ public:
npc_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -457,7 +457,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -1450,7 +1450,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (me->IsValidAttackTarget(who))
AttackStart(who);
@@ -1562,7 +1562,7 @@ public:
DoMeleeAttackIfReady();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -2062,7 +2062,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
@@ -2219,7 +2219,7 @@ public:
uiEventPhase = 1;
}
- void SetGUID(ObjectGuid uiGuid, int32 /*iId*/ = 0) override
+ void SetGUID(ObjectGuid const& uiGuid, int32 /*iId*/ = 0) override
{
uiPlayerGUID = uiGuid;
}
@@ -2435,7 +2435,7 @@ public:
_playerGUID.Clear();
}
- void SetGUID(ObjectGuid guid, int32 /*action*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
if (!_playerGUID.IsEmpty())
return;
diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp
index 4dadebb1cda..5794eb7f758 100644
--- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp
+++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp
index 0e51de2382a..eb4a6d7c614 100644
--- a/src/server/scripts/Northrend/zone_dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -68,7 +68,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index 93fedc08f4d..f771c587e25 100644
--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -631,7 +631,7 @@ class npc_torturer_lecraft : public CreatureScript
_playerGUID.Clear();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
_events.ScheduleEvent(EVENT_HEMORRHAGE, urand(5000, 8000));
_events.ScheduleEvent(EVENT_KIDNEY_SHOT, urand(12000, 15000));
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index 9eb66ad9f3e..a17f52d7bde 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -171,7 +171,7 @@ public:
}
}
- void EnterCombat(Unit* /*Who*/) override
+ void JustEngagedWith(Unit* /*Who*/) override
{
Talk(SAY_RANDOMAGGRO);
}
@@ -217,7 +217,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* Who) override
+ void JustEngagedWith(Unit* Who) override
{
if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f))
{
@@ -558,7 +558,7 @@ public:
{
npc_venture_co_stragglerAI(Creature* creature) : ScriptedAI(creature) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_CHOP, Seconds(3), Seconds(6));
}
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 29a87e32d69..c1848464bde 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -631,7 +631,7 @@ public:
npc_riven_widow_cocoonAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void JustDied(Unit* killer) override
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index 849a3d5568b..6cd5d23bfd9 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -437,7 +437,7 @@ public:
events.ScheduleEvent(EVENT_SPAWN, 3000);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index 9bf9cf1017c..7a1150af29c 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index ab3300c0db1..e03d74856de 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -66,7 +66,7 @@ class npc_injured_goblin : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void Reset() override { }
@@ -348,7 +348,7 @@ public:
npc_icefangAI(Creature* creature) : npc_escortAI(creature) { }
void AttackStart(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void EnterEvadeMode(EvadeReason /*why*/) override { }
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override
diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
index 2a1238d5e4e..3b0a90be56f 100644
--- a/src/server/scripts/Northrend/zone_wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2017 TrinityCore
+/* Copyright (C) 2008-2018 TrinityCore
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -273,7 +273,7 @@ class npc_wg_queue : public CreatureScript
FrostArmor_Timer = 0;
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 21983384ab6..43f7747ee3c 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
index e74bb1f0ba7..7de320fee4b 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
index 811324abebd..a37e6adaae9 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index 89b76d8eeb2..1de3497d875 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
index 77b9e755ab7..8fa558e81bc 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
index 4086c822c1e..3a736f2f02f 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
index 1a8f4ec0d53..b949a79ecee 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPScriptLoader.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPScriptLoader.cpp
index 250a013e8f9..ecbe992ee8f 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPScriptLoader.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPScriptLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
index 6f87e29034f..759e496d2c7 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
index 276e190577d..37536aee41f 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index 97ddc96106f..9ea5be34d04 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
index 77301b96328..afb0ce8aea8 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
index 18354890ba9..fcca8088ac6 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index 386d65c31ce..b7867fce8bf 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ public:
Class_Timer = 1000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{ }
void SetMyClass(uint8 myclass)
@@ -215,7 +215,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
@@ -341,7 +341,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index 1037fcebcf8..5a9e8c9f658 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{ }
void JustSummoned(Creature* summoned) override
@@ -196,7 +196,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{ }
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
index 9655b20b551..1da7e599be1 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index 7917d40b8f7..1ef2c87433e 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -104,10 +104,10 @@ class boss_nexusprince_shaffar : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BEACON, 10000);
events.ScheduleEvent(EVENT_FIREBALL, 8000);
@@ -210,7 +210,7 @@ class npc_ethereal_beacon : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (Creature* shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100.0f))
if (!shaffar->IsInCombat())
@@ -285,7 +285,7 @@ class npc_ethereal_apprentice : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3000);
}
@@ -345,7 +345,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000));
}
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index 0b0dd616311..ea8bb96d49b 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -67,9 +67,9 @@ public:
Talk(SAY_KILL);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_DARK_SHELL, 20000);
events.ScheduleEvent(EVENT_VOID_BLAST, urand(8000, 23000));
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
index 7f388b198ae..9731b8edd1c 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
index 707eb89ef9b..1807e4bd32c 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
index e2bbdd30f9d..92ced2c9c17 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -85,9 +85,9 @@ class boss_anzu : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000);
events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000);
}
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index f0bc7a3b537..cceac337777 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -89,9 +89,9 @@ public:
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000);
events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4000);
events.ScheduleEvent(EVENT_FROST_SHOCK, 6000);
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index 7c04bfead79..14c27fe0be2 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -81,9 +81,9 @@ public:
BossAI::MoveInLineOfSight(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5000);
events.ScheduleEvent(EVENT_POLYMORPH, 8000);
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 31f874dcb61..28be6c07c16 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
index 3471b23daa2..f904b5b35fa 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 976f95cfd90..5cb33701997 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ class boss_ambassador_hellmaw : public CreatureScript
Start(true, false, ObjectGuid::Empty, NULL, false, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_instance->SetBossState(DATA_AMBASSADOR_HELLMAW, IN_PROGRESS);
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index fa3978840c9..8466b374bea 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -69,9 +69,9 @@ class boss_blackheart_the_inciter : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000);
events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000);
events.ScheduleEvent(EVENT_WAR_STOMP, 15000);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 0d59d301a5a..4ceac92e44c 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -133,9 +133,9 @@ class boss_grandmaster_vorpil : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000));
if (IsHeroic())
events.ScheduleEvent(EVENT_BANISH, 17000);
@@ -246,7 +246,7 @@ class npc_voidtraveler : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index ac9ef77cd82..e9ac7637936 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -84,9 +84,9 @@ class boss_murmur : public CreatureScript
me->ResetPlayerDamageReq();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 0e75d609195..1a720970bbc 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
index 8b830ccad65..2d906c26514 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index 48334af4ab9..a62755aa033 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 042cff87618..7fa89edb232 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -88,7 +88,7 @@ public:
void JustDied(Unit* /*killer*/) override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_CLEAVE, 5000);
_events.ScheduleEvent(EVENT_IGNORED, 7000);
@@ -220,7 +220,7 @@ public:
});
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->RemoveAurasDueToSpell(SPELL_GREATER_INVISIBILITY);
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index bf9bc77bf30..b16b38801ab 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index 7d851ec8bf7..dad48782475 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -130,10 +130,10 @@ public:
BossAI::AttackStart(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60));
ScheduleEvents();
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 485ed8ef496..ff8da59fe0c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -470,9 +470,9 @@ public:
akama->AI()->DoAction(ACTION_ACTIVE_AKAMA_INTRO);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->SetCanDualWield(true);
if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
musicController->PlayDirectMusic(EVENT_BT_SUMMIT_WALK_3_SOUND_ID);
@@ -1633,7 +1633,7 @@ public:
});
}
- void SetGUID(ObjectGuid guid, int32 /*id*/) override
+ void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
_targetGUID = guid;
if (Unit* target = ObjectAccessor::GetUnit(*me, _targetGUID))
@@ -1679,7 +1679,7 @@ public:
_canDown = true;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.SetPhase(PHASE_1);
_events.ScheduleEvent(EVENT_CAGE_TRAP, Seconds(30));
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index 5a516537591..da5a92fcffb 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -148,12 +148,12 @@ public:
DoCastSelf(SPELL_EMPYREAL_BALANCE, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (!_inCombat)
{
_inCombat = true;
- _EnterCombat();
+ _JustEngagedWith();
for (uint32 bossData : CouncilData)
{
if (Creature* council = instance->GetCreature(bossData))
@@ -261,7 +261,7 @@ struct IllidariCouncilBossAI : public BossAI
events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetCombatPulseDelay(5);
me->setActive(true);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index d1993aae981..3c35fd63aae 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -122,9 +122,9 @@ public:
_enraged = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SILENCING_SHRIEK, Seconds(22));
events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, Seconds(15));
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index d5f52b2fc7c..7dcdc907f1a 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -353,7 +353,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SetCombatPulseDelay(5);
me->setActive(true);
@@ -438,7 +438,7 @@ public:
_dead = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SPIRIT_SHOCK, Seconds(11));
events.ScheduleEvent(EVENT_RUNE_SHIELD, Seconds(16));
@@ -561,7 +561,7 @@ public:
DoCastSelf(SPELL_AURA_OF_ANGER);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(ANGER_SAY_FREED);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index c2131a46696..344097aec1e 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -753,7 +753,7 @@ public:
}
void EnterEvadeMode(EvadeReason /*why*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* who) override
{
@@ -843,7 +843,7 @@ public:
me->DespawnOrUnsummon(Seconds(5));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(5));
_events.ScheduleEvent(EVENT_SHIELD_BASH, Seconds(10), Seconds(16));
@@ -921,7 +921,7 @@ public:
me->DespawnOrUnsummon(Seconds(5));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_DEBILITATING_POISON, Milliseconds(500), Seconds(2));
_events.ScheduleEvent(EVENT_EVISCERATE, Seconds(2), Seconds(5));
@@ -990,7 +990,7 @@ public:
me->DespawnOrUnsummon(Seconds(5));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_RAIN_OF_FIRE, Seconds(18));
_events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(6));
@@ -1068,7 +1068,7 @@ public:
me->DespawnOrUnsummon(Seconds(5));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SPIRIT_HEAL, Seconds(5), Seconds(6));
}
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index 67dfa42b543..093cce5f485 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -85,9 +85,9 @@ public:
_DespawnAtEvade();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
ChangePhase();
events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
events.ScheduleEvent(EVENT_FLAME, Seconds(20));
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 6df3a3dd545..9d6c27144c7 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -124,9 +124,9 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.SetPhase(PHASE_COMBAT);
events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 3805b0d1f18..f0b490a1ae4 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -98,9 +98,9 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_NEEDLE, Seconds(2));
events.ScheduleEvent(EVENT_SHIELD, Seconds(60));
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 6215bc47bb9..a4d3c3f923a 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index a468f9714ad..f6dc16e837a 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -209,7 +209,7 @@ public:
me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
StartEvent(who);
}
@@ -354,7 +354,7 @@ public:
ENSURE_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
instance->SetGuidData(DATA_KARATHRESSEVENT_STARTER, who->GetGUID());
instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS);
@@ -486,7 +486,7 @@ public:
ENSURE_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventTidalvessDeath();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
instance->SetGuidData(DATA_KARATHRESSEVENT_STARTER, who->GetGUID());
instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS);
@@ -608,7 +608,7 @@ public:
ENSURE_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventCaribdisDeath();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
instance->SetGuidData(DATA_KARATHRESSEVENT_STARTER, who->GetGUID());
instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 0bce78607d3..33771cc7091 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -174,7 +174,7 @@ public:
}
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 815aec6ed2f..4e94cd1edbc 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -254,14 +254,14 @@ public:
instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
// remove old tainted cores to prevent cheating in phase 2
Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
if (Player* player = itr->GetSource())
player->DestroyItemCount(31088, 1, true);
- StartEvent(); // this is EnterCombat(), so were are 100% in combat, start the event
+ StartEvent(); // this is JustEngagedWith(), so were are 100% in combat, start the event
if (Phase != 2)
AttackStart(who);
@@ -603,7 +603,7 @@ public:
VashjGUID = instance->GetGuidData(DATA_LADYVASHJ);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -683,7 +683,7 @@ public:
ENSURE_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->EventTaintedElementalDeath();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
me->AddThreat(who, 0.1f);
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index d9c86cbd946..710e4c56f47 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ public:
Initialize();
}
- void SetGUID(ObjectGuid guid, int32 id/* = 0 */) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
if (id == INNER_DEMON_VICTIM)
victimGUID = guid;
@@ -131,7 +131,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (!victimGUID)
return;
@@ -408,7 +408,7 @@ public:
instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (me->HasAura(AURA_BANISH))
return;
@@ -647,7 +647,7 @@ public:
DoCast(me, 8149, true);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
StartEvent();
}
@@ -722,7 +722,7 @@ public:
ENSURE_AI(boss_leotheras_the_blind::boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
me->InterruptNonMeleeSpells(false);
instance->SetGuidData(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID());
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index f7a09e9b578..54eb1414755 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -164,7 +164,7 @@ public:
Summons.DespawnAll();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS);
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 8640213703e..9543e4e10ea 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@ public:
instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Playercount = me->GetMap()->GetPlayers().getSize();
StartEvent();
@@ -322,7 +322,7 @@ public:
me->SetFaction(FACTION_MONSTER);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* who) override
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index 160bf15faa9..408b6b422af 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index 0fe6a947e05..3d2a4ea45ce 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index f7e9dff38bf..48857041337 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -67,10 +67,10 @@ class boss_hydromancer_thespia : public CreatureScript
Talk(SAY_SLAY);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15000);
events.ScheduleEvent(EVENT_LUNG_BURST, 7000);
@@ -138,7 +138,7 @@ class npc_coilfang_waterelemental : public CreatureScript
_events.Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(3000, 6000));
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index bd13ab09a67..390d861730f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -107,7 +107,7 @@ public:
Talk(SAY_SLAY);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -230,7 +230,7 @@ public:
//react only if attacked
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index e0aaf89e25d..0c3dd765e11 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -75,7 +75,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void StartRageGen(Unit* /*caster*/)
{
@@ -136,7 +136,7 @@ public:
instance->SetBossState(DATA_WARLORD_KALITHRESH, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 08298b15eac..73ad79d47b1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index 30f9f34a5da..9d80f1a6a86 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index d169a21f0d4..aceee192b45 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -173,9 +173,9 @@ public:
me->SetControlled(true, UNIT_STATE_ROOT);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_INITIAL_EMERGE, Milliseconds(4));
events.ScheduleEvent(EVENT_SYNCH_HEALTH, Seconds(3));
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
index 7a9fa30b631..0144d817071 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -71,9 +71,9 @@ class boss_mennu_the_betrayer : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000);
events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20000);
events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 60000);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
index 36400166f09..dd75e1e4b42 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,9 +61,9 @@ class boss_quagmirran : public CreatureScript
_JustDied();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_ACID_SPRAY, 25000);
events.ScheduleEvent(EVENT_CLEAVE, 9000);
events.ScheduleEvent(EVENT_UPPERCUT, 20000);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
index cab61b0f7e9..91d1edf025c 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -69,9 +69,9 @@ class boss_rokmar_the_crackler : public CreatureScript
_JustDied();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10000);
events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20000);
events.ScheduleEvent(EVENT_WATER_SPIT, 14000);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
index 77b438a11c2..1038604f2a2 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
index 9b22d61f4e7..044f68a3aaa 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
index ca8c64194ab..0172340670b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -151,7 +151,7 @@ public:
void AttackStart(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
index a21d4238625..1940b5b8374 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@ public:
Striders.DespawnAll();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustSummoned(Creature* summon) override
{
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
index 7da087cc0b1..4037386998f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 1406c118ad1..cf5c9f53c8e 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -103,9 +103,9 @@ class boss_gruul : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index a9447f55a35..a3ed0d74ada 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -129,7 +129,7 @@ public:
Talk(SAY_OGRE_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -252,7 +252,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -339,7 +339,7 @@ public:
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -431,7 +431,7 @@ public:
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -514,7 +514,7 @@ public:
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
index dd9017d780d..86d53002a71 100644
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 2145ebee721..626ba4b8421 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index 4c05bde00cb..ba879cd5832 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index f99c85a4c5c..ab9ac593bb5 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -58,9 +58,9 @@ class boss_broggok : public CreatureScript
DoAction(ACTION_RESET_BROGGOK);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index 2c746b0038d..b95b94b5400 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -97,9 +97,9 @@ class boss_kelidan_the_breaker : public CreatureScript
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_WAKE);
if (me->IsNonMeleeSpellCast(false))
me->InterruptNonMeleeSpells(true);
@@ -297,7 +297,7 @@ class npc_shadowmoon_channeler : public CreatureScript
me->InterruptNonMeleeSpells(true);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
ENSURE_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index 7528a98c650..d0c817aafef 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -51,9 +51,9 @@ class boss_the_maker : public CreatureScript
{
boss_the_makerAI(Creature* creature) : BossAI(creature, DATA_THE_MAKER) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_ACID_SPRAY, 15000);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 2e22f6becf3..d87f3eb1937 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index 4f8784b1685..773905382ac 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -86,9 +86,9 @@ class boss_omor_the_unscarred : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 1fe1479c512..bee72bf775b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ class boss_nazan : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void IsSummonedBy(Unit* summoner) override
{
@@ -225,10 +225,10 @@ class boss_vazruden : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
}
void KilledUnit(Unit* who) override
@@ -354,7 +354,7 @@ class boss_vazruden_the_herald : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (phase == 0)
{
@@ -480,7 +480,7 @@ class npc_hellfire_sentry : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* killer) override
{
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 4715ba21e88..899ca964548 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -76,12 +76,12 @@ class boss_watchkeeper_gargolmar : public CreatureScript
_Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000);
events.ScheduleEvent(EVENT_SURGE, 4000);
- _EnterCombat();
+ _JustEngagedWith();
}
void MoveInLineOfSight(Unit* who) override
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index 620f4018f6d..e7661d488f7 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 8d6ac51f81a..d8995407305 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 1c20e4c41be..d6a6ab38885 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -327,7 +327,7 @@ class npc_hellfire_channeler : public CreatureScript
me->SetReactState(REACT_DEFENSIVE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->InterruptNonMeleeSpells(false);
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index 9d99e289864..2b4f6cd37f6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index c2deaf331bb..fe93061e858 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 2bf0b1870fb..b97b15a66db 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -199,7 +199,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
ScriptedAI::MoveInLineOfSight(who);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
@@ -326,7 +326,7 @@ class npc_fel_orc_convert : public CreatureScript
void MoveInLineOfSight(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_HEMORRHAGE, 3000);
@@ -387,7 +387,7 @@ class npc_lesser_shadow_fissure : public CreatureScript
void Reset() override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
};
CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 68ac53eb708..476e0ed9b42 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -196,7 +196,7 @@ class boss_warbringer_omrogg : public CreatureScript
ThreatYell = true;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
@@ -415,7 +415,7 @@ class npc_omrogg_heads : public CreatureScript
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SetData(uint32 data, uint32 value) override
{
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index a4f10aa9eda..fda0124c364 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
removeAdds();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 156100f1316..ded16752951 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
index 3dad650b782..5f95314e9fa 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index d62746e098f..886dfea62aa 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index e80845549d7..eb286ca4f9f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -139,9 +139,9 @@ class boss_alar : public CreatureScript
me->setActive(false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
me->SetDisableGravity(true); // after enterevademode will be set walk movement
me->setActive(true);
}
@@ -478,7 +478,7 @@ class npc_ember_of_alar : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -542,7 +542,7 @@ class npc_flame_patch_alar : public CreatureScript
{
npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 134f0b37ba1..14fd77a8c3b 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -167,10 +167,10 @@ class boss_high_astromancer_solarian : public CreatureScript
_JustDied();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
}
void SummonMinion(uint32 entry, float x, float y, float z)
@@ -446,7 +446,7 @@ class npc_solarium_priest : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 28ff78217fd..da4402ec5b0 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -901,7 +901,7 @@ class boss_thaladred_the_darkener : public CreatureScript
advisorbase_ai::Reset();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_THALADRED_AGGRO);
me->AddThreat(who, 5000000.0f);
@@ -999,7 +999,7 @@ class boss_lord_sanguinar : public CreatureScript
advisorbase_ai::Reset();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_SANGUINAR_AGGRO);
}
@@ -1095,7 +1095,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_CAPERNIAN_AGGRO);
}
@@ -1204,7 +1204,7 @@ class boss_master_engineer_telonicus : public CreatureScript
advisorbase_ai::JustDied(killer);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_TELONICUS_AGGRO);
}
@@ -1281,7 +1281,7 @@ class npc_kael_flamestrike : public CreatureScript
void MoveInLineOfSight(Unit* /*who*/) override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 36f6afd00fb..5d37fff4cce 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -78,10 +78,10 @@ class boss_void_reaver : public CreatureScript
_JustDied();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_POUNDING, 15000);
events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 8e757f85dc4..28e6c4c187f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index a7fdef9d99f..6b85c6376a0 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ class npc_crystalcore_devastator : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
index 1111e2409f5..fc3024c340f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index b10b6276337..06da0fc4932 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,9 +65,9 @@ class boss_gatewatcher_gyrokill : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000);
events.ScheduleEvent(EVENT_SAW_BLADE, 20000);
events.ScheduleEvent(EVENT_SHADOW_POWER, 25000);
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index e73459d3d24..57607d0a224 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -62,9 +62,9 @@ class boss_gatewatcher_iron_hand : public CreatureScript
{
boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 55000);
events.ScheduleEvent(EVENT_JACKHAMMER, 45000);
events.ScheduleEvent(EVENT_SHADOW_POWER, 25000);
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index 19036555787..415e9a54a64 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -75,9 +75,9 @@ class boss_mechano_lord_capacitus : public CreatureScript
{
boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(YELL_AGGRO);
events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15 * IN_MILLISECONDS);
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 199fa3d81c1..4ecca88d93e 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -67,9 +67,9 @@ class boss_nethermancer_sepethrea : public CreatureScript
{
boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(12000, 18000));
events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(18000, 22000));
@@ -182,7 +182,7 @@ class npc_ragin_flames : public CreatureScript
me->SetSpeedRate(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 239d6522fe5..3c5b6dad9e8 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -75,9 +75,9 @@ class boss_pathaleon_the_calculator : public CreatureScript
{
boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_SUMMON, 30000);
events.ScheduleEvent(EVENT_MANA_TAP, urand(12000, 20000));
events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(16000, 25000));
@@ -198,7 +198,7 @@ class npc_nether_wraith : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index 47587cf528e..4c9e17ae4a8 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
index 35494c745f8..482f4c9874e 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 6c469601efc..334b2b4bc4d 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ class npc_millhouse_manastorm : public CreatureScript
struct npc_millhouse_manastormAI : public ScriptedAI
{
- npc_millhouse_manastormAI(Creature* creature) : ScriptedAI(creature)
+ npc_millhouse_manastormAI(Creature* creature) : ScriptedAI(creature), Init(false)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -83,7 +83,6 @@ class npc_millhouse_manastorm : public CreatureScript
{
EventProgress_Timer = 2000;
LowHp = false;
- Init = false;
Phase = 1;
Pyroblast_Timer = 1000;
@@ -105,7 +104,10 @@ class npc_millhouse_manastorm : public CreatureScript
Initialize();
if (instance->GetData(DATA_WARDEN_2) == DONE)
+ {
Init = true;
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
+ }
if (instance->GetBossState(DATA_HARBINGER_SKYRISS) == DONE)
Talk(SAY_COMPLETE);
@@ -177,6 +179,7 @@ class npc_millhouse_manastorm : public CreatureScript
case 7:
instance->SetData(DATA_WARDEN_2, DONE);
Init = true;
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
break;
}
++Phase;
@@ -324,11 +327,11 @@ class npc_warden_mellichar : public CreatureScript
float attackRadius = me->GetAttackDistance(who)/10;
if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who))
- EnterCombat(who);
+ JustEngagedWith(who);
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(YELL_INTRO1);
DoCast(me, SPELL_BUBBLE_VISUAL);
@@ -544,7 +547,7 @@ class npc_zerekethvoidzone : public CreatureScript
DoCast(me, SPELL_VOID_ZONE_DAMAGE);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
};
CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index 038dfb16067..abe629d5630 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -47,7 +47,8 @@ enum AZCreatureIds
NPC_DALLIAH = 20885,
NPC_SOCCOTHRATES = 20886,
NPC_MELLICHAR = 20904, // skyriss will kill this unit
- NPC_ALPHA_POD_TARGET = 21436
+ NPC_ALPHA_POD_TARGET = 21436,
+ NPC_MILLHOUSE = 20977
};
enum AZGameObjectIds
@@ -62,10 +63,15 @@ enum AZGameObjectIds
GO_WARDENS_SHIELD = 184802 // shield 'protecting' mellichar
};
-template
-AI* GetArcatrazAI(Creature* creature)
+enum AZSpellIds
{
- return GetInstanceAI(creature, ArcatrazScriptName);
+ SPELL_QID_10886 = 39564
+};
+
+template
+inline AI* GetArcatrazAI(T* obj)
+{
+ return GetInstanceAI(obj, ArcatrazScriptName);
}
#endif // ARCATRAZ_H
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index 52481ac629d..0cd2dd6ef1a 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -82,9 +82,9 @@ class boss_dalliah_the_doomsayer : public CreatureScript
soccothrates->AI()->SetData(1, 1);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000));
events.ScheduleEvent(EVENT_WHIRLWIND, urand(7000, 9000));
if (IsHeroic())
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index fec78e29e9e..3de1123fef5 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -97,9 +97,9 @@ class boss_harbinger_skyriss : public CreatureScript
void Reset() override
{
- if (!Intro)
- me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+ _Reset();
+ me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
Initialize();
}
@@ -111,7 +111,7 @@ class boss_harbinger_skyriss : public CreatureScript
ScriptedAI::MoveInLineOfSight(who);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
@@ -130,6 +130,9 @@ class boss_harbinger_skyriss : public CreatureScript
if (me->GetVictim())
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
summon->AI()->AttackStart(target);
+
+ summons.Summon(summon);
+ summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void KilledUnit(Unit* victim) override
@@ -285,10 +288,11 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
void Reset() override
{
- me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
};
CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 4f12a669a6a..3371cc4775e 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -108,9 +108,9 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
dalliah->AI()->SetData(1, 1);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
events.ScheduleEvent(EVENT_ME_FIRST, 6000);
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index 54693d3776a..d28b595553b 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -61,9 +61,9 @@ class boss_zereketh_the_unbound : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000));
events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000));
events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 91d7def906d..71f60c731c1 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -46,6 +46,8 @@ class instance_arcatraz : public InstanceMapScript
void OnCreatureCreate(Creature* creature) override
{
+ InstanceScript::OnCreatureCreate(creature);
+
switch (creature->GetEntry())
{
case NPC_DALLIAH:
@@ -57,6 +59,9 @@ class instance_arcatraz : public InstanceMapScript
case NPC_MELLICHAR:
MellicharGUID = creature->GetGUID();
break;
+ case NPC_MILLHOUSE:
+ MillhouseGUID = creature->GetGUID();
+ break;
default:
break;
}
@@ -179,6 +184,15 @@ class instance_arcatraz : public InstanceMapScript
SetData(DATA_WARDEN_4, NOT_STARTED);
SetData(DATA_WARDEN_5, NOT_STARTED);
}
+ else if (state == DONE)
+ {
+ if (!instance->IsHeroic())
+ break;
+
+ if (Creature* millhouse = instance->GetCreature(MillhouseGUID))
+ if (millhouse->IsAlive())
+ DoCastSpellOnPlayers(SPELL_QID_10886);
+ }
break;
default:
break;
@@ -192,6 +206,7 @@ class instance_arcatraz : public InstanceMapScript
ObjectGuid StasisPodGUIDs[5];
ObjectGuid MellicharGUID;
ObjectGuid WardensShieldGUID;
+ ObjectGuid MillhouseGUID;
uint8 ConversationState;
uint8 StasisPodStates[5];
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index ad83bd90e61..4719a4e07b4 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -66,9 +66,9 @@ class boss_commander_sarannis : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_ARCANE_RESONANCE, 42700);
events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 15200);
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index 7709251a877..d5efd734f03 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ class boss_high_botanist_freywinn : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index 7f1d74986e0..fb86404b5e4 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -165,7 +165,7 @@ class boss_laj : public CreatureScript
CanSummon = false;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 6480b8a2b58..8474654e2ea 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -68,9 +68,9 @@ class boss_thorngrin_the_tender : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SACRIFICE, 5700);
events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000);
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 31f1c0ddbf0..f02cb80d243 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -90,7 +90,7 @@ class npc_warp_splinter_treant : public CreatureScript
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -170,7 +170,7 @@ class boss_warp_splinter : public CreatureScript
me->SetSpeedRate(MOVE_RUN, 0.7f);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index 3d878bae81e..11e2df1b599 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
index fc773d0b133..811c432087b 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
+++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 4d8ca8ff2be..f2bd2d6894b 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -88,7 +88,7 @@ class boss_doomlord_kazzak : public CreatureScript
Talk(SAY_INTRO);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index 68dae506fa3..863d48c8875 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ class boss_doomwalker : public CreatureScript
Talk(SAY_DEATH);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Outland/outland_script_loader.cpp b/src/server/scripts/Outland/outland_script_loader.cpp
index 65488a81bf1..6f421c6284b 100644
--- a/src/server/scripts/Outland/outland_script_loader.cpp
+++ b/src/server/scripts/Outland/outland_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index 42d5a806e9f..b9455e8130b 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* who) override
@@ -253,7 +253,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* who) override
@@ -555,7 +555,7 @@ class npc_simon_bunny : public CreatureScript
}
// Used for getting involved player guid. Parameter id is used for defining if is a large(Monument) or small(Relic) node
- void SetGUID(ObjectGuid guid, int32 id) override
+ void SetGUID(ObjectGuid const& guid, int32 id) override
{
me->SetCanFly(true);
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 55d28f3d6a5..273fa0dc33a 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -31,10 +31,14 @@ npc_fel_guard_hound
EndContentData */
#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
-#include "ScriptedEscortAI.h"
+#include "CellImpl.h"
+#include "GridNotifiersImpl.h"
+#include "Log.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
#include "Player.h"
+#include "ScriptedEscortAI.h"
+#include "ScriptedGossip.h"
#include "WorldSession.h"
/*######
@@ -262,7 +266,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
Talk(SAY_ELF_AGGRO);
@@ -1037,6 +1041,206 @@ public:
}
};
+enum WatchCommanderLeonus
+{
+ SAY_COVER = 0,
+ EVENT_LEONUS_TALK = 1,
+ EVENT_INFERNAL_RAIN_ATTACK = 2,
+ EVENT_FEAR_CONTROLLER_CAST = 3,
+ EVENT_ACTIVE_FALSE = 4,
+ NPC_INFERNAL_RAIN = 18729,
+ SPELL_INFERNAL_RAIN = 33814,
+ NPC_FEAR_CONTROLLER = 19393,
+ DATA_ACTIVE = 1,
+};
+
+struct npc_watch_commander_leonus : public ScriptedAI
+{
+ npc_watch_commander_leonus(Creature* creature) : ScriptedAI(creature) { }
+
+ void Reset() override
+ {
+ _events.Reset();
+ _events.ScheduleEvent(EVENT_LEONUS_TALK, Minutes(2), Minutes(10));
+ _events.ScheduleEvent(EVENT_INFERNAL_RAIN_ATTACK, Minutes(2), Minutes(10));
+ _events.ScheduleEvent(EVENT_FEAR_CONTROLLER_CAST, Minutes(2), Minutes(10));
+ }
+
+ void SetData(uint32 /*type*/, uint32 data) override
+ {
+ switch (data)
+ {
+ case DATA_ACTIVE:
+ _events.ScheduleEvent(EVENT_ACTIVE_FALSE, Seconds(1));
+ break;
+ default:
+ break;
+ }
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ _events.Update(diff);
+
+ while (uint32 eventId = _events.ExecuteEvent())
+ {
+ switch (eventId)
+ {
+ case EVENT_LEONUS_TALK:
+ Talk(SAY_COVER);
+ me->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT);
+ break;
+ case EVENT_INFERNAL_RAIN_ATTACK:
+ {
+ std::list infernalrainList;
+ Trinity::AllCreaturesOfEntryInRange checkerInfernalrain(me, NPC_INFERNAL_RAIN, 200.0f);
+ Trinity::CreatureListSearcher searcherInfernal(me, infernalrainList, checkerInfernalrain);
+ Cell::VisitAllObjects(me, searcherInfernal, 200.0f);
+
+ for (Creature* infernal : infernalrainList)
+ if (!infernal->isMoving() && infernal->GetPositionZ() > 118.0f)
+ infernal->AI()->SetData(DATA_ACTIVE, DATA_ACTIVE);
+
+ break;
+ }
+ case EVENT_FEAR_CONTROLLER_CAST:
+ {
+ std::list fearcontrollerList;
+ Trinity::AllCreaturesOfEntryInRange checkerFear(me, NPC_FEAR_CONTROLLER, 200.0f);
+ Trinity::CreatureListSearcher searcherFear(me, fearcontrollerList, checkerFear);
+ Cell::VisitAllObjects(me, searcherFear, 200.0f);
+
+ for (Creature* fearController : fearcontrollerList)
+ fearController->AI()->SetData(DATA_ACTIVE, DATA_ACTIVE);
+
+ break;
+ }
+ case EVENT_ACTIVE_FALSE:
+ _events.ScheduleEvent(EVENT_LEONUS_TALK, Hours(1));
+ _events.ScheduleEvent(EVENT_INFERNAL_RAIN_ATTACK, Hours(1));
+ _events.ScheduleEvent(EVENT_FEAR_CONTROLLER_CAST, Hours(1));
+ break;
+ }
+ }
+
+ if (!UpdateVictim())
+ return;
+
+ DoMeleeAttackIfReady();
+ }
+
+private:
+ EventMap _events;
+};
+
+enum InfernalRainHellfire
+{
+ EVENT_INFERNAL_RAIN_CAST = 1,
+ EVENT_INFERNAL_RAIN_STOP = 2,
+ NPC_WATCH_COMMANDER_LEONUS = 19392
+};
+
+struct npc_infernal_rain_hellfire : public ScriptedAI
+{
+ npc_infernal_rain_hellfire(Creature* creature) : ScriptedAI(creature) { }
+
+ void SetData(uint32 /*type*/, uint32 data) override
+ {
+ switch (data)
+ {
+ case DATA_ACTIVE:
+ _events.ScheduleEvent(EVENT_INFERNAL_RAIN_CAST, Seconds(1), Seconds(2));
+ _events.ScheduleEvent(EVENT_INFERNAL_RAIN_STOP, Seconds(60));
+ break;
+ default:
+ break;
+ }
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ _events.Update(diff);
+
+ while (uint32 eventId = _events.ExecuteEvent())
+ {
+ switch (eventId)
+ {
+ case EVENT_INFERNAL_RAIN_CAST:
+ {
+ std::list infernalrainList;
+ Trinity::AllCreaturesOfEntryInRange checker(me, NPC_INFERNAL_RAIN, 200.0f);
+ Trinity::CreatureListSearcher searcher(me, infernalrainList, checker);
+ Cell::VisitAllObjects(me, searcher, 200.0f);
+
+ if (!infernalrainList.empty())
+ {
+ Creature* random = Trinity::Containers::SelectRandomContainerElement(infernalrainList);
+ if (random->isMoving() && random->GetPositionZ() < 118.0f)
+ {
+ me->CastSpell(random, SPELL_INFERNAL_RAIN, true);
+ }
+ }
+
+ _events.ScheduleEvent(EVENT_INFERNAL_RAIN_CAST, Seconds(1), Seconds(2));
+ break;
+ }
+ case EVENT_INFERNAL_RAIN_STOP:
+ _events.CancelEvent(EVENT_INFERNAL_RAIN_CAST);
+ if (Creature* watchcommanderLeonus = me->FindNearestCreature(NPC_WATCH_COMMANDER_LEONUS, 200))
+ watchcommanderLeonus->AI()->SetData(DATA_ACTIVE, DATA_ACTIVE);
+
+ break;
+ }
+ }
+ }
+
+private:
+ EventMap _events;
+};
+
+enum fear_controller
+{
+ EVENT_FEAR_CAST = 1,
+ EVENT_FEAR_STOP = 2,
+ SPELL_FEAR = 33815 // Serverside spell
+};
+
+struct npc_fear_controller : public ScriptedAI
+{
+ npc_fear_controller(Creature* creature) : ScriptedAI(creature) { }
+
+ void SetData(uint32 /*type*/, uint32 data) override
+ {
+ if (data == DATA_ACTIVE)
+ {
+ _events.ScheduleEvent(EVENT_FEAR_CAST, Seconds(1));
+ _events.ScheduleEvent(EVENT_FEAR_STOP, Seconds(60));
+ }
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ _events.Update(diff);
+
+ while (uint32 eventId = _events.ExecuteEvent())
+ {
+ switch (eventId)
+ {
+ case EVENT_FEAR_CAST:
+ DoCastAOE(SPELL_FEAR);
+ _events.Repeat(Seconds(10));
+ break;
+ case EVENT_FEAR_STOP:
+ _events.CancelEvent(EVENT_FEAR_CAST);
+ break;
+ }
+ }
+ }
+
+private:
+ EventMap _events;
+};
+
void AddSC_hellfire_peninsula()
{
new npc_aeranas();
@@ -1046,4 +1250,7 @@ void AddSC_hellfire_peninsula()
new npc_colonel_jules();
new npc_barada();
new npc_magister_aledis();
+ RegisterCreatureAI(npc_watch_commander_leonus);
+ RegisterCreatureAI(npc_infernal_rain_hellfire);
+ RegisterCreatureAI(npc_fear_controller);
}
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index d63081c71b8..71a81938843 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@ public:
FrostShockTimer = 6000;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_EARTHBIND_TOTEM, false);
}
@@ -234,7 +234,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* who) override
@@ -473,7 +473,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false);
}
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index fd7c47b5c5b..631871fc2e1 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustSummoned(Creature* summoned) override
{
@@ -401,7 +401,7 @@ public:
me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
PlayerGUID = who->GetGUID();
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 0acc455a62d..fb89bf4019b 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -702,7 +702,7 @@ public:
DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
//don't always use
if (rand32() % 5)
@@ -877,7 +877,7 @@ public:
me->SetTarget(ObjectGuid::Empty);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void HandleAnimation()
{
@@ -1046,7 +1046,7 @@ public:
me->SetVisible(false);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
@@ -1181,7 +1181,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
@@ -1452,7 +1452,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
switch (me->GetEntry())
{
diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp
index 4c1fdc2f6bd..15a4648020a 100644
--- a/src/server/scripts/Outland/zone_shattrath_city.cpp
+++ b/src/server/scripts/Outland/zone_shattrath_city.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 9b4c738c78a..79a0f92d3b5 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ public:
me->SetFaction(FACTION_OGRE);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DoNice()
{
@@ -189,7 +189,7 @@ public:
npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* done_by, uint32 &damage) override
{
@@ -240,7 +240,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* who) override
@@ -287,7 +287,7 @@ public:
npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DamageTaken(Unit* done_by, uint32 &damage) override
{
@@ -386,7 +386,7 @@ class npc_floon : public CreatureScript
me->SetFaction(m_uiNormFaction);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp
index e4d352f9229..7a918198b8e 100644
--- a/src/server/scripts/Outland/zone_zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index a17b9fd8b59..dacca30c514 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index 3f08f8273ac..d9e12fba562 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -280,7 +280,7 @@ class npc_pet_gen_mojo : public CreatureScript
me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 /*diff*/) override { }
void ReceiveEmote(Player* player, uint32 emote) override
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index 89bb8a76302..7e19315ec5f 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -65,7 +65,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript
_isViper = false;
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void Reset() override
{
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index fa2e65f7104..1616e8e229b 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -158,7 +158,7 @@ class npc_pet_mage_mirror_image : public CreatureScript
owner->CastSpell(me, SPELL_MAGE_CLONE_ME, false);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (me->GetVictim() && !me->GetVictim()->HasBreakableByDamageCrowdControlAura(me))
{
diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp
index 09dc6c07439..c344523988b 100644
--- a/src/server/scripts/Pet/pet_priest.cpp
+++ b/src/server/scripts/Pet/pet_priest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Pet/pet_script_loader.cpp b/src/server/scripts/Pet/pet_script_loader.cpp
index 1edae76fde0..f6fed722056 100644
--- a/src/server/scripts/Pet/pet_script_loader.cpp
+++ b/src/server/scripts/Pet/pet_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp
index 0a578d8bd20..cca10c674ba 100644
--- a/src/server/scripts/Pet/pet_shaman.cpp
+++ b/src/server/scripts/Pet/pet_shaman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/ScriptLoader.cpp.in.cmake b/src/server/scripts/ScriptLoader.cpp.in.cmake
index 39e68abb882..bd96b32f70d 100644
--- a/src/server/scripts/ScriptLoader.cpp.in.cmake
+++ b/src/server/scripts/ScriptLoader.cpp.in.cmake
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/ScriptLoader.h b/src/server/scripts/ScriptLoader.h
index 7ec1106ab26..532c8f08e7b 100644
--- a/src/server/scripts/ScriptLoader.h
+++ b/src/server/scripts/ScriptLoader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/ScriptPCH.cpp b/src/server/scripts/ScriptPCH.cpp
index 3f2c3430e4d..68a806c3771 100644
--- a/src/server/scripts/ScriptPCH.cpp
+++ b/src/server/scripts/ScriptPCH.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006 - 2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/ScriptPCH.h b/src/server/scripts/ScriptPCH.h
index 35fd1e6b94d..f5fc547bc54 100644
--- a/src/server/scripts/ScriptPCH.h
+++ b/src/server/scripts/ScriptPCH.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006 - 2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index b5df37b7535..e00681f3e91 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index fe94fb7e8fc..e5e44543abd 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index bc20433511f..90f599c870d 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index 8cf817b3aaa..90e658690c4 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 4d7193e8b6f..7e3332c2992 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index b5401b2b31c..02511885d6b 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -474,6 +474,22 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader
}
};
+// 64415 Val'anyr Hammer of Ancient Kings - Equip Effect
+class spell_item_valanyr_hammer_of_ancient_kings : public AuraScript
+{
+ PrepareAuraScript(spell_item_valanyr_hammer_of_ancient_kings);
+
+ bool CheckProc(ProcEventInfo& eventInfo)
+ {
+ return eventInfo.GetHealInfo() && eventInfo.GetHealInfo()->GetEffectiveHeal() > 0;
+ }
+
+ void Register() override
+ {
+ DoCheckProc += AuraCheckProcFn(spell_item_valanyr_hammer_of_ancient_kings::CheckProc);
+ }
+};
+
enum DeadlyPrecision
{
SPELL_DEADLY_PRECISION = 71564
@@ -1787,6 +1803,47 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader
}
};
+enum PowerCircle
+{
+ SPELL_LIMITLESS_POWER = 45044
+};
+
+// 45043 - Power Circle (Shifting Naaru Sliver)
+class spell_item_power_circle : public AuraScript
+{
+ PrepareAuraScript(spell_item_power_circle);
+
+ bool Validate(SpellInfo const* /*spellInfo*/) override
+ {
+ return ValidateSpellInfo({ SPELL_LIMITLESS_POWER });
+ }
+
+ bool CheckCaster(Unit* target)
+ {
+ return target->GetGUID() == GetCasterGUID();
+ }
+
+ void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+ {
+ GetTarget()->CastSpell(nullptr, SPELL_LIMITLESS_POWER, true);
+ if (Aura* buff = GetTarget()->GetAura(SPELL_LIMITLESS_POWER))
+ buff->SetDuration(GetDuration());
+ }
+
+ void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+ {
+ GetTarget()->RemoveAurasDueToSpell(SPELL_LIMITLESS_POWER);
+ }
+
+ void Register() override
+ {
+ DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_item_power_circle::CheckCaster);
+
+ AfterEffectApply += AuraEffectApplyFn(spell_item_power_circle::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+ AfterEffectRemove += AuraEffectRemoveFn(spell_item_power_circle::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+ }
+};
+
// http://www.wowhead.com/item=6657 Savory Deviate Delight
// 8213 Savory Deviate Delight
enum SavoryDeviateDelight
@@ -4692,6 +4749,7 @@ void AddSC_item_spell_scripts()
new spell_item_aura_of_madness();
new spell_item_dementia();
new spell_item_blessing_of_ancient_kings();
+ RegisterAuraScript(spell_item_valanyr_hammer_of_ancient_kings);
new spell_item_deadly_precision();
new spell_item_deadly_precision_dummy();
new spell_item_deathbringers_will("spell_item_deathbringers_will_normal");
@@ -4723,6 +4781,7 @@ void AddSC_item_spell_scripts()
new spell_item_persistent_shield();
new spell_item_pet_healing();
new spell_item_piccolo_of_the_flaming_fire();
+ RegisterAuraScript(spell_item_power_circle);
new spell_item_savory_deviate_delight();
new spell_item_scroll_of_recall();
new spell_item_unsated_craving();
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index ff802462c7e..57af21af003 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 56b391db900..5914059b60c 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp
index a94c129a518..a7b515fd791 100644
--- a/src/server/scripts/Spells/spell_pet.cpp
+++ b/src/server/scripts/Spells/spell_pet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 2408abe20d0..d8f6ad43143 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 7188a69e4f9..664dfbc20a2 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index e9453b48736..25edcf0eccc 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_script_loader.cpp b/src/server/scripts/Spells/spell_script_loader.cpp
index ce1664b2811..5a86fdf23f0 100644
--- a/src/server/scripts/Spells/spell_script_loader.cpp
+++ b/src/server/scripts/Spells/spell_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 73252016748..582ddad0c03 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 6de09b0a63e..80715de7834 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 30950f76914..226906c426d 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 9495970378c..98414ee89af 100644
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp
index 03ff4cae77f..85cae1216cf 100644
--- a/src/server/scripts/World/action_ip_logger.cpp
+++ b/src/server/scripts/World/action_ip_logger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index cc3983d7e70..2708a59d520 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index c674a32f43f..d80435ece56 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -273,10 +273,10 @@ class boss_ysondre : public CreatureScript
events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_YSONDRE_AGGRO);
- WorldBossAI::EnterCombat(who);
+ WorldBossAI::JustEngagedWith(who);
}
// Summon druid spirits on 75%, 50% and 25% health
@@ -367,10 +367,10 @@ class boss_lethon : public CreatureScript
events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10000);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_LETHON_AGGRO);
- WorldBossAI::EnterCombat(who);
+ WorldBossAI::JustEngagedWith(who);
}
void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -502,10 +502,10 @@ class boss_emeriss : public CreatureScript
emerald_dragonAI::KilledUnit(who);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_EMERISS_AGGRO);
- WorldBossAI::EnterCombat(who);
+ WorldBossAI::JustEngagedWith(who);
}
void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -600,10 +600,10 @@ class boss_taerar : public CreatureScript
events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
Talk(SAY_TAERAR_AGGRO);
- emerald_dragonAI::EnterCombat(who);
+ emerald_dragonAI::JustEngagedWith(who);
}
void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) override
diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
index 9b3465174a4..972791e8a22 100644
--- a/src/server/scripts/World/chat_log.cpp
+++ b/src/server/scripts/World/chat_log.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
index a29924cc459..00ff46aba81 100644
--- a/src/server/scripts/World/duel_reset.cpp
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 78f2c468991..5f4635717c3 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index a5d3ce8d500..1dbb55831d9 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY)
Talk(SAY_GUARD_SIL_AGGRO, who);
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 56253d6ffcc..b1e1986e443 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index a7370fde1b5..3bb43efcac8 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
index 3755217f150..5bd5e310075 100644
--- a/src/server/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index c359c8d0276..2a574d0ff36 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -1098,64 +1098,64 @@ public:
{
switch (gossipListId)
{
- case GOSSIP_OPTION_ALCHEMY:
- case GOSSIP_OPTION_BLACKSMITHING:
- case GOSSIP_OPTION_ENCHANTING:
- case GOSSIP_OPTION_ENGINEERING:
- case GOSSIP_OPTION_HERBALISM:
- case GOSSIP_OPTION_INSCRIPTION:
- case GOSSIP_OPTION_JEWELCRAFTING:
- case GOSSIP_OPTION_LEATHERWORKING:
- case GOSSIP_OPTION_MINING:
- case GOSSIP_OPTION_SKINNING:
- case GOSSIP_OPTION_TAILORING:
- SendTrainerList(player, gossipListId);
+ case GOSSIP_OPTION_ALCHEMY:
+ case GOSSIP_OPTION_BLACKSMITHING:
+ case GOSSIP_OPTION_ENCHANTING:
+ case GOSSIP_OPTION_ENGINEERING:
+ case GOSSIP_OPTION_HERBALISM:
+ case GOSSIP_OPTION_INSCRIPTION:
+ case GOSSIP_OPTION_JEWELCRAFTING:
+ case GOSSIP_OPTION_LEATHERWORKING:
+ case GOSSIP_OPTION_MINING:
+ case GOSSIP_OPTION_SKINNING:
+ case GOSSIP_OPTION_TAILORING:
+ SendTrainerList(player, gossipListId);
break;
- case GOSSIP_OPTION_MULTI:
- {
- switch (menuId)
+ case GOSSIP_OPTION_MULTI:
{
- case GOSSIP_MENU_HERBALISM:
- SendTrainerList(player, GOSSIP_OPTION_HERBALISM);
- break;
- case GOSSIP_MENU_MINING:
- SendTrainerList(player, GOSSIP_OPTION_MINING);
- break;
- case GOSSIP_MENU_SKINNING:
- SendTrainerList(player, GOSSIP_OPTION_SKINNING);
- break;
- case GOSSIP_MENU_ALCHEMY:
- SendTrainerList(player, GOSSIP_OPTION_ALCHEMY);
- break;
- case GOSSIP_MENU_BLACKSMITHING:
- SendTrainerList(player, GOSSIP_OPTION_BLACKSMITHING);
- break;
- case GOSSIP_MENU_ENCHANTING:
- SendTrainerList(player, GOSSIP_OPTION_ENCHANTING);
- break;
- case GOSSIP_MENU_ENGINEERING:
- SendTrainerList(player, GOSSIP_OPTION_ENGINEERING);
- break;
- case GOSSIP_MENU_INSCRIPTION:
- SendTrainerList(player, GOSSIP_OPTION_INSCRIPTION);
- break;
- case GOSSIP_MENU_JEWELCRAFTING:
- SendTrainerList(player, GOSSIP_OPTION_JEWELCRAFTING);
- break;
- case GOSSIP_MENU_LEATHERWORKING:
- SendTrainerList(player, GOSSIP_OPTION_LEATHERWORKING);
- break;
- case GOSSIP_MENU_TAILORING:
- SendTrainerList(player, GOSSIP_OPTION_TAILORING);
- break;
+ switch (menuId)
+ {
+ case GOSSIP_MENU_HERBALISM:
+ SendTrainerList(player, GOSSIP_OPTION_HERBALISM);
+ break;
+ case GOSSIP_MENU_MINING:
+ SendTrainerList(player, GOSSIP_OPTION_MINING);
+ break;
+ case GOSSIP_MENU_SKINNING:
+ SendTrainerList(player, GOSSIP_OPTION_SKINNING);
+ break;
+ case GOSSIP_MENU_ALCHEMY:
+ SendTrainerList(player, GOSSIP_OPTION_ALCHEMY);
+ break;
+ case GOSSIP_MENU_BLACKSMITHING:
+ SendTrainerList(player, GOSSIP_OPTION_BLACKSMITHING);
+ break;
+ case GOSSIP_MENU_ENCHANTING:
+ SendTrainerList(player, GOSSIP_OPTION_ENCHANTING);
+ break;
+ case GOSSIP_MENU_ENGINEERING:
+ SendTrainerList(player, GOSSIP_OPTION_ENGINEERING);
+ break;
+ case GOSSIP_MENU_INSCRIPTION:
+ SendTrainerList(player, GOSSIP_OPTION_INSCRIPTION);
+ break;
+ case GOSSIP_MENU_JEWELCRAFTING:
+ SendTrainerList(player, GOSSIP_OPTION_JEWELCRAFTING);
+ break;
+ case GOSSIP_MENU_LEATHERWORKING:
+ SendTrainerList(player, GOSSIP_OPTION_LEATHERWORKING);
+ break;
+ case GOSSIP_MENU_TAILORING:
+ SendTrainerList(player, GOSSIP_OPTION_TAILORING);
+ break;
+ default:
+ break;
+ }
+ }
default:
break;
- }
}
- default:
- break;
- }
- return true;
+ return false;
}
void SendTrainerList(Player* player, uint32 Index)
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index c632eca0163..8ef373bbd70 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2006-2009 ScriptDev2
*
* This program is free software; you can redistribute it and/or modify it
@@ -285,7 +285,7 @@ public:
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -406,7 +406,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void ReceiveEmote(Player* player, uint32 emote) override
{
@@ -806,7 +806,7 @@ public:
void UpdateAI(uint32 diff) override;
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void QuestAccept(Player* player, Quest const* quest) override
{
@@ -878,7 +878,7 @@ public:
}
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* caster, SpellInfo const* spell) override
{
@@ -1084,7 +1084,7 @@ public:
me->SetHealth(me->CountPctFromMaxHealth(70));
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* caster, SpellInfo const* spell) override
{
@@ -1191,7 +1191,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -1405,7 +1405,7 @@ public:
npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void OnPossess(bool apply)
{
@@ -1458,7 +1458,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -2438,7 +2438,7 @@ public:
me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void DoAction(int32 /*param*/) override
{
diff --git a/src/server/scripts/World/world_script_loader.cpp b/src/server/scripts/World/world_script_loader.cpp
index 086bd8700f2..3e9fcf9f876 100644
--- a/src/server/scripts/World/world_script_loader.cpp
+++ b/src/server/scripts/World/world_script_loader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index a016a6bc505..ffa0bee4adc 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/shared/DataStores/DB2FileLoader.cpp b/src/server/shared/DataStores/DB2FileLoader.cpp
index dec839b0c1c..dacb14674c2 100644
--- a/src/server/shared/DataStores/DB2FileLoader.cpp
+++ b/src/server/shared/DataStores/DB2FileLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/DataStores/DB2FileLoader.h b/src/server/shared/DataStores/DB2FileLoader.h
index 59cea1ac738..2895fc2c3f3 100644
--- a/src/server/shared/DataStores/DB2FileLoader.h
+++ b/src/server/shared/DataStores/DB2FileLoader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h
index 5ee36216ed8..b1dc322e949 100644
--- a/src/server/shared/DataStores/DB2Store.h
+++ b/src/server/shared/DataStores/DB2Store.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/DataStores/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp
index f9461f46542..1a3d33677a1 100644
--- a/src/server/shared/DataStores/DBCFileLoader.cpp
+++ b/src/server/shared/DataStores/DBCFileLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
index f93eafb5593..708a34156ba 100644
--- a/src/server/shared/DataStores/DBCFileLoader.h
+++ b/src/server/shared/DataStores/DBCFileLoader.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index e71b2b805ed..48714fa7665 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/DataStores/DBStorageIterator.h b/src/server/shared/DataStores/DBStorageIterator.h
index b54fd32a8ca..2a3742863cd 100644
--- a/src/server/shared/DataStores/DBStorageIterator.h
+++ b/src/server/shared/DataStores/DBStorageIterator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index 070bdc149f2..8bd0a10c55f 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h
index 0d64c337cbe..2973a103d6f 100644
--- a/src/server/shared/Dynamic/LinkedList.h
+++ b/src/server/shared/Dynamic/LinkedList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h
index 0dbf1ebf2a6..432e67665f7 100644
--- a/src/server/shared/Dynamic/LinkedReference/RefManager.h
+++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index c0c4ec21a80..9f9805d71fe 100644
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index 5f614819b13..394147e992d 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h
index d36c90e2514..bea05adf59f 100644
--- a/src/server/shared/Dynamic/TypeContainer.h
+++ b/src/server/shared/Dynamic/TypeContainer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h
index 99c1f01030a..f8481c1bd09 100644
--- a/src/server/shared/Dynamic/TypeContainerFunctions.h
+++ b/src/server/shared/Dynamic/TypeContainerFunctions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h
index 44fa0fe927c..61dea073972 100644
--- a/src/server/shared/Dynamic/TypeContainerVisitor.h
+++ b/src/server/shared/Dynamic/TypeContainerVisitor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Dynamic/TypeList.h b/src/server/shared/Dynamic/TypeList.h
index 5413a88c8b6..d9e5c01a0d0 100644
--- a/src/server/shared/Dynamic/TypeList.h
+++ b/src/server/shared/Dynamic/TypeList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Networking/AsyncAcceptor.h b/src/server/shared/Networking/AsyncAcceptor.h
index 0c9e71be973..4251a0868b3 100644
--- a/src/server/shared/Networking/AsyncAcceptor.h
+++ b/src/server/shared/Networking/AsyncAcceptor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/Networking/NetworkThread.h b/src/server/shared/Networking/NetworkThread.h
index ad176a9ae26..e384e1515ae 100644
--- a/src/server/shared/Networking/NetworkThread.h
+++ b/src/server/shared/Networking/NetworkThread.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -37,7 +37,7 @@ template
class NetworkThread
{
public:
- NetworkThread() : _connections(0), _stopped(false), _thread(nullptr),
+ NetworkThread() : _connections(0), _stopped(false), _thread(nullptr), _io_service(1),
_acceptSocket(_io_service), _updateTimer(_io_service)
{
}
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index 351c7f1d26c..f78b20f715e 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h
index 594304d4c1c..e0ae87d908e 100644
--- a/src/server/shared/Networking/SocketMgr.h
+++ b/src/server/shared/Networking/SocketMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp
index 4f5eeb82a04..99a5df18b0a 100644
--- a/src/server/shared/Packets/ByteBuffer.cpp
+++ b/src/server/shared/Packets/ByteBuffer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index bc31f14406c..da10cb9199f 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp
index 60d08964640..7c1fe1fcb61 100644
--- a/src/server/shared/Realm/Realm.cpp
+++ b/src/server/shared/Realm/Realm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/Realm/Realm.h b/src/server/shared/Realm/Realm.h
index ecc8cd47c50..2605474ac5b 100644
--- a/src/server/shared/Realm/Realm.h
+++ b/src/server/shared/Realm/Realm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp
index a69a30b3d69..1f8f021b19f 100644
--- a/src/server/shared/Realm/RealmList.cpp
+++ b/src/server/shared/Realm/RealmList.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Realm/RealmList.h b/src/server/shared/Realm/RealmList.h
index 3fbb677d9b6..d55be284d60 100644
--- a/src/server/shared/Realm/RealmList.h
+++ b/src/server/shared/Realm/RealmList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 94ab5e480f3..a0f1ee8f8a7 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index d5e03edbd04..4e6f52616c0 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h
index 427478e5227..4d1605fb07c 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.h
+++ b/src/server/worldserver/CommandLine/CliRunnable.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 45473f9ad85..fa4ab6a4631 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp
index 6c75fe0807b..09a1d1a8622 100644
--- a/src/server/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/worldserver/RemoteAccess/RASession.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/worldserver/RemoteAccess/RASession.h b/src/server/worldserver/RemoteAccess/RASession.h
index 3cd5189ef2c..aa77fd08427 100644
--- a/src/server/worldserver/RemoteAccess/RASession.h
+++ b/src/server/worldserver/RemoteAccess/RASession.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008-2017 TrinityCore
+* Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp
index 86d1c861f48..d39d26ec8b5 100644
--- a/src/server/worldserver/TCSoap/TCSoap.cpp
+++ b/src/server/worldserver/TCSoap/TCSoap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h
index e342c154964..c3aade6f7d8 100644
--- a/src/server/worldserver/TCSoap/TCSoap.h
+++ b/src/server/worldserver/TCSoap/TCSoap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index c050a992393..00415506e2e 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -409,17 +409,6 @@ DetectPosCollision = 1
CheckGameObjectLoS = 1
-#
-# TargetPosRecalculateRange
-# Description: Max distance from movement target point (+moving unit size) and targeted
-# object (+size) after that new target movement point calculated.
-# Range: 0.5-5.0
-# Default: 1.5
-# 0.5 - (Minimum, Contact Range, More sensitive reaction to target movement)
-# 5.0 - (Maximum, Melee attack range, Less CPU usage)
-
-TargetPosRecalculateRange = 1.5
-
#
# UpdateUptimeInterval
# Description: Update realm uptime period (in minutes).
diff --git a/src/server/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc
index 86e1850eb0b..56fcf6b34f7 100644
--- a/src/server/worldserver/worldserver.rc
+++ b/src/server/worldserver/worldserver.rc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2009 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 7cf20edc158..2bbaa3e24d0 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 58e6dc0a2bc..abee2a22484 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright (C) 2005-2009 MaNGOS project
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index b744d2cc4e3..ba5a4a1e63b 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
index bf0def4e6a0..f8f72dc4161 100644
--- a/src/tools/map_extractor/adt.cpp
+++ b/src/tools/map_extractor/adt.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
index 1e0137ef419..68b84f73527 100644
--- a/src/tools/map_extractor/adt.h
+++ b/src/tools/map_extractor/adt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp
index f8f5a811759..0c584e7d054 100644
--- a/src/tools/map_extractor/dbcfile.cpp
+++ b/src/tools/map_extractor/dbcfile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h
index b3b993644c0..6b06ff79112 100644
--- a/src/tools/map_extractor/dbcfile.h
+++ b/src/tools/map_extractor/dbcfile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
index 3cd8f236da0..74051d402dd 100644
--- a/src/tools/map_extractor/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 2e02c609d39..0a8ef2f8dee 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp
index 8e65101e2d4..1da5954c0ff 100644
--- a/src/tools/map_extractor/wdt.cpp
+++ b/src/tools/map_extractor/wdt.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/map_extractor/wdt.h b/src/tools/map_extractor/wdt.h
index 948b863e263..ec1186cee0a 100644
--- a/src/tools/map_extractor/wdt.h
+++ b/src/tools/map_extractor/wdt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index 4a788d2bd2a..2709b43e22f 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp
index 6a802ff1059..397702a4989 100644
--- a/src/tools/mmaps_generator/IntermediateValues.cpp
+++ b/src/tools/mmaps_generator/IntermediateValues.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
index edcf372e376..44f5669b9d4 100644
--- a/src/tools/mmaps_generator/IntermediateValues.h
+++ b/src/tools/mmaps_generator/IntermediateValues.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 0f32fd7b451..5e6b12d71ab 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index 19715cbdea6..4064614175d 100644
--- a/src/tools/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index 1ddb5a8009c..4f553302c00 100644
--- a/src/tools/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
index bd56a2ee6a3..0013b5e13f3 100644
--- a/src/tools/mmaps_generator/PathGenerator.cpp
+++ b/src/tools/mmaps_generator/PathGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 5be7687faae..a703382c8a3 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index f5f282d1d35..979753131ed 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index 47615b937b6..14066daf90b 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright (C) 2005-2009 MaNGOS project
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp
index c1615c28d0d..9a4cbe95b2b 100644
--- a/src/tools/vmap4_assembler/VMapAssembler.cpp
+++ b/src/tools/vmap4_assembler/VMapAssembler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index e565855e7bc..83ac9f5c556 100644
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright (C) 2005-2009 MaNGOS project
-# Copyright (C) 2008-2017 TrinityCore
+# Copyright (C) 2008-2018 TrinityCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp
index c7b37700061..d6a0a642bc0 100644
--- a/src/tools/vmap4_extractor/adtfile.cpp
+++ b/src/tools/vmap4_extractor/adtfile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h
index 8062bbeef58..6567254108a 100644
--- a/src/tools/vmap4_extractor/adtfile.h
+++ b/src/tools/vmap4_extractor/adtfile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp
index fc24d993a2c..7e37511e530 100644
--- a/src/tools/vmap4_extractor/dbcfile.cpp
+++ b/src/tools/vmap4_extractor/dbcfile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h
index fbe8300cfe2..9a56bed30b5 100644
--- a/src/tools/vmap4_extractor/dbcfile.h
+++ b/src/tools/vmap4_extractor/dbcfile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp
index 0fefec0904d..1af3e51a452 100644
--- a/src/tools/vmap4_extractor/gameobject_extract.cpp
+++ b/src/tools/vmap4_extractor/gameobject_extract.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 357c206d00a..204bca77cad 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h
index 5569093bc5c..fea5cb3f7a9 100644
--- a/src/tools/vmap4_extractor/model.h
+++ b/src/tools/vmap4_extractor/model.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/modelheaders.h b/src/tools/vmap4_extractor/modelheaders.h
index cf093e59346..78f1db50c81 100644
--- a/src/tools/vmap4_extractor/modelheaders.h
+++ b/src/tools/vmap4_extractor/modelheaders.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h
index dd89bc1afb7..0fa5f328e58 100644
--- a/src/tools/vmap4_extractor/vec3d.h
+++ b/src/tools/vmap4_extractor/vec3d.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 316d1c0fb1e..33630d635b5 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/vmapexport.h b/src/tools/vmap4_extractor/vmapexport.h
index 461d27f8b77..a73d259d52b 100644
--- a/src/tools/vmap4_extractor/vmapexport.h
+++ b/src/tools/vmap4_extractor/vmapexport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index 58704e65d15..8948489a900 100644
--- a/src/tools/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 13f7531cd33..49f10cf306c 100644
--- a/src/tools/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index b6b9a1854e6..2b0bee9417b 100644
--- a/src/tools/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index ee8e15dc56c..a5c4e71d93c 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 TrinityCore
+ * Copyright (C) 2008-2018 TrinityCore
* Copyright (C) 2005-2011 MaNGOS
*
* This program is free software; you can redistribute it and/or modify it