diff --git a/.travis.yml b/.travis.yml
index a0ba819d93..6e473dabf8 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 4758155e25..626935f851 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 e7bd9263a7..150b9b7143 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 51f1e716f0..391bfea28b 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 3bc010f173..9e89404c17 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 a55d204950..d408c3cc9e 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 af61e90737..5f363cc33f 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 1658f47e9e..717adc533f 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/FindBoost.cmake b/cmake/macros/FindBoost.cmake
index 836b1b1c38..6d892da211 100644
--- a/cmake/macros/FindBoost.cmake
+++ b/cmake/macros/FindBoost.cmake
@@ -482,7 +482,7 @@ else()
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.65.1" "1.65.0" "1.65"
+ "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
"1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
"1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
"1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
@@ -851,6 +851,25 @@ if(Boost_DEBUG)
"_boost_DEBUG_ABI_TAG = ${_boost_DEBUG_ABI_TAG}")
endif()
+#TODO: fix this when CMake is updated
+#======================
+# Systematically build up the Boost architecture and address model tag
+# http://www.boost.org/doc/libs/1_66_0/more/getting_started/windows.html#library-naming
+set( _boost_AAM_TAG "-x")
+# Key Use this library when:
+# 32 32-bit address model
+# 64 64-bit address model
+if(PLATFORM EQUAL 64)
+ set( _boost_AAM_TAG "${_boost_AAM_TAG}64")
+else()
+ set( _boost_AAM_TAG "${_boost_AAM_TAG}32")
+endif()
+
+if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_AAM_TAG = ${_boost_AAM_TAG}")
+endif()
+
# ------------------------------------------------------------------------
# Begin finding boost libraries
# ------------------------------------------------------------------------
@@ -991,10 +1010,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
unset(_boost_RELEASE_NAMES)
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
endforeach()
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
@@ -1002,10 +1023,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
endforeach()
list( APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
endif()
@@ -1033,10 +1056,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
unset(_boost_DEBUG_NAMES)
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
endforeach()
- list(APPEND
+ list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
@@ -1045,10 +1070,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
endforeach()
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_AAM_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
endif()
diff --git a/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake
index 99ba073fda..d1b06184fc 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 a102760fc0..4f6f774111 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 6cd9aa2f53..0ef502e410 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 16f56bfcbd..e6d08d28a5 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 8b37fd406e..9f671bba30 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 0d3a4ce9be..19540e67b8 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 ad3d92933c..35d70287f8 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 2961a0fc13..b6f8c3e409 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 a4ddc9be8c..a952370c31 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 29c54f7c6f..1c7168d775 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 6362714f2e..46f513e3f2 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 a680cb48ae..a54b6e44b9 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 fe064931b2..22ff0406ea 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 3d84750be7..d2d2533979 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 6187be78da..74d2cdefc4 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 ab2c5618bf..1437887c9a 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 078e39f0a8..64860ab203 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 b21c5e38a4..e7d87c8458 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 2a152a135c..8fa628250f 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 9f2d76cca2..b55df28fdb 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 104b0dc05c..b82d18e576 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 77352d81c8..1d16f7b5a5 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 9ba8cc7a1b..6f0c040fab 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 381d40b42d..321016f539 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 d93680d7f7..77a97cab0a 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 e3119121cd..71b87efc58 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,7 +9,7 @@
#define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
#define _FULL_DATABASE "TDB_full_world_434.25_2017_12_17.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/updates/world/4.3.4/2017_12_19_00_world.sql b/sql/updates/world/4.3.4/2017_12_19_00_world.sql
new file mode 100644
index 0000000000..0788aa230a
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_19_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `playercreateinfo_skills` SET `classMask`= `classMask`| 8 WHERE `skill`= 44;
diff --git a/sql/updates/world/4.3.4/2017_12_19_01_world.sql b/sql/updates/world/4.3.4/2017_12_19_01_world.sql
new file mode 100644
index 0000000000..1f995823f7
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_19_01_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `spell_learn_spell` WHERE `entry`= 87840;
+INSERT INTO `spell_learn_spell` (`entry`, `SpellID`, `Active`) VALUES
+(87840, 33388, 1);
+UPDATE `spell_bonus_data` SET `direct_bonus`= 0.654 WHERE `entry`= 133;
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/updates/world/4.3.4/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql
new file mode 100644
index 0000000000..021d1e25d8
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql
@@ -0,0 +1,2 @@
+-- The Shadow Labyrinth door Lever
+UPDATE `gameobject_template_addon` SET `flags`=0 WHERE `entry` IN (183518);
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/updates/world/4.3.4/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql
new file mode 100644
index 0000000000..79a25debf9
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature` SET `spawnMask`=3 WHERE `id` IN (18956,19511);
+UPDATE `smart_scripts` SET `event_flags`=7 WHERE `entryorguid` IN (18956) AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_flags`=7 WHERE `entryorguid` IN (1895600) AND `source_type`=9;
+UPDATE `gameobject` SET `spawnMask` = 3 WHERE `spawnMask` = 1 AND `id` IN (181278,181556,181557,181569,183051,182940,186633,185434,181275,184931,181276,181270,184956,184940,183296,183516,182942,182943,183036,183295,184941,183441) AND `map` NOT IN (530,548,568,571);
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/updates/world/4.3.4/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql
new file mode 100644
index 0000000000..d24faaa61d
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql
@@ -0,0 +1,7 @@
+/*
+--
+UPDATE `creature_template` SET `maxgold` = 1093073 WHERE `entry` = 36855;
+UPDATE `creature_template` SET `mingold` = 1674308, `maxgold` = 2186146 WHERE `entry` = 38106;
+UPDATE `creature_template` SET `mingold` = 1925454, `maxgold` = 2514068 WHERE `entry` = 38296;
+UPDATE `creature_template` SET `mingold` = 2092885, `maxgold` = 2732683 WHERE `entry` = 38297;
+*/
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/updates/world/4.3.4/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql
new file mode 100644
index 0000000000..77633df193
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql
@@ -0,0 +1,15 @@
+/*
+--
+UPDATE `creature_template` SET `maxgold` = 22960 WHERE `entry` = 36829;
+UPDATE `creature_template` SET `mingold` = 36640, `maxgold` = 45920 WHERE `entry` = 38074;
+UPDATE `creature_template` SET `maxgold` = 7536 WHERE `entry` = 37028;
+UPDATE `creature_template` SET `mingold` = 9214, `maxgold` = 15072 WHERE `entry` = 38094;
+UPDATE `creature_template` SET `maxgold` = 07510 WHERE `entry` = 37031;
+UPDATE `creature_template` SET `mingold` = 10912, `maxgold` = 15020 WHERE `entry` = 38090;
+UPDATE `creature_template` SET `maxgold` = 07665 WHERE `entry` = 37029;
+UPDATE `creature_template` SET `mingold` = 9494, `maxgold` = 15330 WHERE `entry` = 38092;
+UPDATE `creature_template` SET `maxgold` = 7599 WHERE `entry` = 37662;
+UPDATE `creature_template` SET `mingold` = 6720, `maxgold` = 15198 WHERE `entry` = 38102;
+UPDATE `creature_template` SET `maxgold` = 7617 WHERE `entry` = 36805;
+UPDATE `creature_template` SET `mingold` = 5346, `maxgold` = 15234 WHERE `entry` = 38075;
+*/
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/updates/world/4.3.4/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql
new file mode 100644
index 0000000000..405f73eebd
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql
@@ -0,0 +1,28 @@
+/*
+--
+UPDATE `creature_template` SET `mingold` = 15123, `maxgold` = 19760 WHERE `entry` = 37328;
+UPDATE `creature_template` SET `mingold` = 15123, `maxgold` = 19760 WHERE `entry` = 37408;
+UPDATE `creature_template` SET `mingold` = 13913, `maxgold` = 18179 WHERE `entry` = 32009;
+UPDATE `creature_template` SET `mingold` = 13913, `maxgold` = 18179 WHERE `entry` = 32087;
+UPDATE `creature_template` SET `mingold` = 17046, `maxgold` = 17046 WHERE `entry` = 29356;
+UPDATE `creature_template` SET `mingold` = 9262, `maxgold` = 17664 WHERE `entry` = 29574;
+UPDATE `creature_template` SET `mingold` = 3988, `maxgold` = 23564 WHERE `entry` = 38110;
+UPDATE `creature_template` SET `mingold` = 1278, `maxgold` = 25596 WHERE `entry` = 30818;
+UPDATE `creature_template` SET `mingold` = 1278, `maxgold` = 25592 WHERE `entry` = 30817;
+UPDATE `creature_template` SET `mingold` = 1282, `maxgold` = 25644 WHERE `entry` = 30816;
+UPDATE `creature_template` SET `mingold` = 43710, `maxgold` = 47060 WHERE `entry` = 31001;
+UPDATE `creature_template` SET `mingold` = 45162, `maxgold` = 49068 WHERE `entry` = 31000;
+UPDATE `creature_template` SET `mingold` = 5460, `maxgold` = 5460 WHERE `entry` = 32368;
+UPDATE `creature_template` SET `mingold` = 6968, `maxgold` = 15324 WHERE `entry` = 34016;
+UPDATE `creature_template` SET `mingold` = 4132, `maxgold` = 25116 WHERE `entry` = 38076;
+UPDATE `creature_template` SET `mingold` = 141844, `maxgold` = 141844 WHERE `entry` = 38031;
+UPDATE `creature_template` SET `mingold` = 4890, `maxgold` = 24368 WHERE `entry` = 38061;
+UPDATE `creature_template` SET `mingold` = 9090, `maxgold` = 18374 WHERE `entry` = 38059;
+UPDATE `creature_template` SET `mingold` = 542268, `maxgold` = 542268 WHERE `entry` = 38444;
+UPDATE `creature_template` SET `mingold` = 6532, `maxgold` = 23044 WHERE `entry` = 38108;
+UPDATE `creature_template` SET `mingold` = 4804, `maxgold` = 24334 WHERE `entry` = 38062;
+UPDATE `creature_template` SET `mingold` = 4380, `maxgold` = 26180 WHERE `entry` = 38063;
+UPDATE `creature_template` SET `mingold` = 570506, `maxgold` = 570506 WHERE `entry` = 38103;
+UPDATE `creature_template` SET `mingold` = 13390, `maxgold` = 24210 WHERE `entry` = 38197;
+UPDATE `creature_template` SET `mingold` = 650000, `maxgold` = 700000 WHERE `entry` = 35349;
+*/
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/updates/world/4.3.4/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql
new file mode 100644
index 0000000000..fa60855d58
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql
@@ -0,0 +1,11 @@
+--
+DELETE FROM `gameobject` WHERE `id`=64922 AND `guid`=189980;
+DELETE FROM `gameobject_addon` WHERE `guid`=189980;
+DELETE FROM `pool_gameobject` WHERE `pool_entry`=5217 ;
+DELETE FROM `pool_creature` WHERE `guid`=134515 AND `pool_entry`=1047;
+DELETE FROM `pool_template` WHERE `entry` IN (5217,5450,5506,5517,5608);
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(5450,1,"Icecrown node 3"),
+(5506,1,"Icecrown node 59"),
+(5517,1,"Icecrown node 70"),
+(5608,1,"Icecrown node 161");
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/updates/world/4.3.4/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql
new file mode 100644
index 0000000000..96c3a51b72
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql
@@ -0,0 +1,41 @@
+--
+-- Add script and waypoints to Draenei Artificer
+SET @ENTRY := 17228;
+SET @GUID := -82823;
+SET @ACTIONLIST_0 := 8282300;
+SET @ACTIONLIST_1 := 8282301;
+
+-- Remove emote from Draenei Artificer
+DELETE FROM `creature_addon` WHERE `guid`=82823;
+INSERT INTO `creature_addon` (`guid`, `emote`, `bytes2`) VALUES
+(82823, 0, 4097);
+
+-- Add weapon to Draenei Artificer
+DELETE FROM `creature_equip_template` WHERE `CreatureID`=@ENTRY AND `ID`=2;
+INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES (@ENTRY, 2, 2530, 0, 0, 18019);
+
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(@ENTRY, 1, -4189.97, -12460.97, 45.227, 'Draenei Artificer'),
+(@ENTRY, 2, -4191.24, -12456.74, 45.444, 'Draenei Artificer'),
+(@ENTRY, 3, -4192.75, -12453.75, 45.635, 'Draenei Artificer'),
+(@ENTRY, 4, -4191.24, -12456.74, 45.444, 'Draenei Artificer'),
+(@ENTRY, 5, -4189.97, -12460.97, 45.227, 'Draenei Artificer'),
+(@ENTRY, 6, -4191.44, -12464.07, 45.340, 'Draenei Artificer');
+
+-- Add SAI to Draenei Artificer + Actionlist 00/01
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@GUID, @ACTIONLIST_0, @ACTIONLIST_1) AND `source_type` IN (0, 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
+(@GUID,0,0,0,40,0,100,0,3,@ENTRY,0,0,80,@ACTIONLIST_0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Waypoint 3 Reached - Run Script"),
+(@GUID,0,1,0,40,0,100,0,6,@ENTRY,0,0,80,@ACTIONLIST_1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Waypoint 6 Reached - Run Script"),
+(@GUID,0,2,0,1,0,100,0,0,0,130000,130000,53,0,@ENTRY,1,0,0,2,1,0,0,0,0,0,0,0,"Draenei Artificer - Out of Combat - Start Waypoint"),
+(@ACTIONLIST_0,9,0,0,0,0,100,0,0,0,0,0,54,60000,0,0,0,0,0,0,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Pause Waypoint"),
+(@ACTIONLIST_0,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.8356,"Draenei Artificer - On Script - Set Orientation 0,8356"),
+(@ACTIONLIST_0,9,2,0,0,0,100,0,1500,1500,0,0,71,2,1,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Change Equipment"),
+(@ACTIONLIST_0,9,3,0,0,0,100,0,2000,2000,0,0,17,234,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 234"),
+(@ACTIONLIST_0,9,4,0,0,0,100,0,55000,55000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 0"),
+(@ACTIONLIST_1,9,0,0,0,0,100,0,0,0,0,0,54,60000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Pause Waypoint"),
+(@ACTIONLIST_1,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.8398,"Draenei Artificer - On Script - Set Orientation 3,8398"),
+(@ACTIONLIST_1,9,3,0,0,0,100,0,1500,1500,0,0,71,1,1,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Change Equipment"),
+(@ACTIONLIST_1,9,4,0,0,0,100,0,2000,2000,0,0,17,234,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 234"),
+(@ACTIONLIST_1,9,5,0,0,0,100,0,55000,55000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 0");
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/updates/world/4.3.4/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql
new file mode 100644
index 0000000000..f1763e3457
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` IN
+(36626,37504,37505,37506, -- Festergut
+39863,39864,39944,39945, -- Halion (normal)
+40142,40143,40144,40145, -- Halion (twilight)
+34797,35447,35448,35449); -- Icehowl
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/updates/world/4.3.4/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql
new file mode 100644
index 0000000000..f11c3d35d8
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql
@@ -0,0 +1,18 @@
+SET @CGUID:= 16806; -- 1 guid
+SET @GGUID:= 1577; -- 2 guids
+
+DELETE FROM `creature` WHERE `guid` = @CGUID;
+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
+(@CGUID, 16031, 329, 0, 0, 1, 1, 0, 0, 4044.78, -3333.68, 117.26, 4.153883, 7200, 0, 0, 4120, 0, 0, 0, 0, 0, '', 0);
+
+DELETE FROM `gameobject` WHERE `guid` IN (@GGUID + 0, @GGUID + 1);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
+(@GGUID + 0, 181071, 329, 2017, 2017, 1, 1, 4044.34, -3334.217, 115.0604, 2.740162, -0, -0, 0.9799242, 0.1993704, 300, 255, 1, '', 0),
+(@GGUID + 1, 181072, 329, 2017, 2017, 1, 1, 4039.52, -3331.85, 115.061, 1.169369, -0, -0, 0.5519361, 0.8338864, 300, 255, 1, '', 0);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = "spell_ysida_saved_credit";
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(31912, "spell_ysida_saved_credit");
+
+UPDATE `creature_template` SET `npcflag` = `npcflag` & ~2, `AIName` = "" WHERE `entry` = 16031;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16031;
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/updates/world/4.3.4/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql
new file mode 100644
index 0000000000..b7fece8a3c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `npcflag` = `npcflag` | 2 WHERE `entry` = 16031;
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/updates/world/4.3.4/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql
new file mode 100644
index 0000000000..9f671922ae
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql
@@ -0,0 +1,18 @@
+-- Quest "The Emitter"
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1707100 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
+(1707100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,20,181286,0,0,0,0,0,0,"Technician Zhanaa - On Script - Activate Gameobject"),
+(1707100,9,1,0,0,0,100,0,0,0,0,0,12,16550,1,39000,0,0,0,8,0,0,0,-4187.71,-13738.7,75.6549,1.85005,"Technician Zhanaa - On Script - Summon Creature 'Image of Technician Dyvuun'"),
+(1707100,9,2,0,0,0,100,0,0,0,0,0,64,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Store Targetlist"),
+(1707100,9,3,0,0,0,100,0,1000,1000,0,0,100,2,0,0,0,0,0,19,16550,10,0,0,0,0,0,"Technician Zhanaa - On Script - Send Target 2"),
+(1707100,9,4,0,0,0,100,0,1000,1000,0,0,45,0,1,0,0,0,0,19,16550,10,0,0,0,0,0,"Technician Zhanaa - On Script - Set Data 0 1"),
+(1707100,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,16550,10,0,0,0,0,0,"Technician Zhanaa - On Script - Set Orientation Closest Creature 'Image of Technician Dyvuun'"),
+(1707100,9,6,0,0,0,100,0,2000,2000,0,0,5,70,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Play Emote 70"),
+(1707100,9,7,0,0,0,100,0,19000,19000,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Run Off"),
+(1707100,9,8,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4186.67,-13736.3,74.4813,0,"Technician Zhanaa - On Script - Move to Position"),
+(1707100,9,9,0,0,0,100,0,3000,3000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Emote State 133"),
+(1707100,9,11,0,0,0,100,0,16000,16000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Orientation Invoker"),
+(1707100,9,12,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Say Line 0"),
+(1707100,9,13,0,0,0,100,0,29000,29000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Emote State 0"),
+(1707100,9,14,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4184.55,-13733.1,74.1389,0,"Technician Zhanaa - On Script - Move to Position"),
+(1707100,9,15,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.91986,"Technician Zhanaa - On Script - Set Orientation");
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/updates/world/4.3.4/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql
new file mode 100644
index 0000000000..f8837525ed
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql
@@ -0,0 +1,93 @@
+-- Aponi Brightmane & Tahu Sagewind
+DELETE FROM `creature_text` WHERE `CreatureID` IN (34526,34528);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(34526,0,0,"Talk to me, Tahu. Something. Anything! I'm going stir-crazy.",12,0,100,0,0,0,34762,0,"Aponi Brightmane"),
+(34526,1,0,"Not much.",12,0,100,0,0,0,34763,0,"Aponi Brightmane"),
+(34526,2,0,"Like Mu'sha.",12,0,100,0,0,0,34764,0,"Aponi Brightmane"),
+(34526,3,0,"Where are you going with this?",12,0,100,6,0,0,34765,0,"Aponi Brightmane"),
+(34526,4,0,"I hear the \"but\" in your voice...",12,0,100,0,0,0,34766,0,"Aponi Brightmane"),
+(34526,5,0,"Do you think his teachings are wrong?",12,0,100,6,0,0,34767,0,"Aponi Brightmane"),
+(34526,6,0,"So are you going to bring this up to the elder?",12,0,100,0,0,0,34768,0,"Aponi Brightmane"),
+(34526,7,0,"I suppose so. It's not silly, though, what you said.",12,0,100,1,0,0,34769,0,"Aponi Brightmane"),
+(34526,8,0,"I see that thoughtful frown, Tahu.",12,0,100,0,0,0,34770,0,"Aponi Brightmane"),
+(34526,9,0,"But something is on your mind, right?",12,0,100,6,0,0,34771,0,"Aponi Brightmane"),
+(34526,10,0,"What about it?",12,0,100,0,0,0,34772,0,"Aponi Brightmane"),
+(34526,11,0,"There's a phrase... \"It's always darkest before the dawn.\" The dawn will come, though, Tahu. The sun will rise. The balance will shift back to where it should be.",12,0,100,1,0,0,34773,0,"Aponi Brightmane"),
+(34526,12,0,"%s smiles and gestures to the north.",16,0,100,25,0,0,34774,0,"Aponi Brightmane"),
+(34526,13,0,"Even on the glacier itself, the sun manages to peek through the gloom. I have hope, Tahu. I think we'll make it through this, no matter how dire it looks.",12,0,100,1,0,0,34775,0,"Aponi Brightmane"),
+(34526,14,0,"But I'd still rather be there on the front lines helping it happen rather than trying to placate myself with belief. We can't just sit around and hope it happens.",12,0,100,0,0,0,34776,0,"Aponi Brightmane"),
+(34526,15,0,"And through that hope, strengthen our side in the fight?",12,0,100,0,0,0,34777,0,"Aponi Brightmane"),
+(34528,0,0,"%s laughs softly.",16,0,100,0,0,0,34745,0,"Tahu Sagewind"),
+(34528,1,0,"All right, Aponi. I've enough on my mind to share. Have you ever spoken to the elves of Moonglade?",12,0,100,1,0,0,34746,0,"Tahu Sagewind"),
+(34528,2,0,"The elves speak of a moon goddess, did you know? They put great stock in the light given by the moon.",12,0,100,0,0,0,34747,0,"Tahu Sagewind"),
+(34528,3,0,"Just like her. The parallels I've heard are interesting. And it's no secret all druids, Shu'halo and elf alike, can call upon Mu'sha's light.",12,0,100,273,0,0,34748,0,"Tahu Sagewind"),
+(34528,4,0,"I wonder. Hamuul has guided us well, and I've learned so much from him. The legends say that our people were druids when time began...",12,0,100,1,0,0,34749,0,"Tahu Sagewind"),
+(34528,5,0,"...but what Hamuul teaches is what the elves know. The night elves. They put such stock in their moon goddess, as creatures of the night.",12,0,100,0,0,0,34750,0,"Tahu Sagewind"),
+(34528,6,0,"No! No, nothing like that. He is an elder for good reason, sister. Mu'sha is one of the Earthmother's eyes, and she watches over us. That isn't sinister.",12,0,100,274,0,0,34751,0,"Tahu Sagewind"),
+(34528,7,0,"But we're nothing if not people who strive for balance. Our warriors fight only when there is need. Our hunters take only what the tribes require to live, and use all they can when they do. The shaman stand as guide and mediator to the elemental spirits.",12,0,100,0,0,0,34753,0,"Tahu Sagewind"),
+(34528,8,0,"And while we, as druids, are guardians of nature, I wonder if we've overlooked a key aspect of balance in all things.",12,0,100,1,0,0,34754,0,"Tahu Sagewind"),
+(34528,9,0,"No, no. No need for him to trouble about a student's idle philosophizing while he entertains a friend.",12,0,100,274,0,0,34755,0,"Tahu Sagewind"),
+(34528,10,0,"Well, it isn't exactly a new thought, sister.",12,0,100,6,0,0,34756,0,"Tahu Sagewind"),
+(34528,11,0,"Sorry, sister. It's nothing to worry about.",12,0,100,0,0,0,34778,0,"Tahu Sagewind"),
+(34528,12,0,"I'm thinking about the front to the north. The one you're so eager to return to.",12,0,100,1,0,0,34779,0,"Tahu Sagewind"),
+(34528,13,0,"I know I'm counseling patience, Aponi, but I don't like remaining here any more than you do. Times are bleak, and failing to act only makes me worry that my idle hand may have been the one to turn the tide.",12,0,100,0,0,0,34780,0,"Tahu Sagewind"),
+(34528,14,0,"Still... there is balance in all things, even death. I simply hate the concept that such destruction and darkness might be necessary.",12,0,100,1,0,0,34781,0,"Tahu Sagewind"),
+(34528,15,0,"I know, sister. I know. We'll return to fighting one day. For now, though, maybe it's best to spread the word to others... give them the hope you have.",12,0,100,1,0,0,34783,0,"Tahu Sagewind"),
+(34528,16,0,"That's the idea.",12,0,100,273,0,0,34784,0,"Tahu Sagewind");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=34526;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=34526 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3452600,3452601) 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
+(34526,0,0,0,20,1,100,0,13986,0,0,0,87,3452600,3452601,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Quest 'An Injured Colleague' Finished - Run Random Script"),
+(34526,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,"Aponi Brightmane - On Respawn - Set Event Phase 1"),
+(3452600,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,"Aponi Brightmane - On Script - Set Event Phase 0"),
+(3452600,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,"Aponi Brightmane - On Script - Say Line 0"),
+(3452600,9,2,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 0 (Tahu Sagewind)"),
+(3452600,9,3,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 1 (Tahu Sagewind)"),
+(3452600,9,4,0,0,0,100,0,5500,5500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 1"),
+(3452600,9,5,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 2 (Tahu Sagewind)"),
+(3452600,9,6,0,0,0,100,0,3000,3000,0,0,86,65630,0,19,34548,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Cross Cast 'Starfall State Visual'"),
+(3452600,9,7,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 2"),
+(3452600,9,8,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 3 (Tahu Sagewind)"),
+(3452600,9,9,0,0,0,100,0,7000,7000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 3"),
+(3452600,9,10,0,0,0,100,0,3000,3000,0,0,1,4,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 4 (Tahu Sagewind)"),
+(3452600,9,11,0,0,0,100,0,7000,7000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 4"),
+(3452600,9,12,0,0,0,100,0,3000,3000,0,0,1,5,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 5 (Tahu Sagewind)"),
+(3452600,9,13,0,0,0,100,0,7000,7000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 5"),
+(3452600,9,14,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 6 (Tahu Sagewind)"),
+(3452600,9,15,0,0,0,100,0,8000,8000,0,0,1,7,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 7 (Tahu Sagewind)"),
+(3452600,9,16,0,0,0,100,0,13000,13000,0,0,1,8,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 8 (Tahu Sagewind)"),
+(3452600,9,17,0,0,0,100,0,2500,2500,0,0,28,0,0,0,0,0,0,19,34548,0,0,0,0,0,0,"Aponi Brightmane - On Script - Remove All Auras"),
+(3452600,9,18,0,0,0,100,0,500,500,0,0,86,65632,0,19,34548,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Cross Cast 'Eclipse Visual'"),
+(3452600,9,19,0,0,0,100,0,3000,3000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 6"),
+(3452600,9,20,0,0,0,100,0,4000,4000,0,0,1,9,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 9 (Tahu Sagewind)"),
+(3452600,9,21,0,0,0,100,0,5500,5500,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 7"),
+(3452600,9,22,0,0,0,100,0,4000,4000,0,0,1,10,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 10 (Tahu Sagewind)"),
+(3452600,9,23,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Set Event Phase 1"),
+(3452601,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,"Aponi Brightmane - On Script - Set Event Phase 0"),
+(3452601,9,1,0,0,0,100,0,3000,3000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 8"),
+(3452601,9,2,0,0,0,100,0,3000,3000,0,0,1,11,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 11 (Tahu Sagewind)"),
+(3452601,9,3,0,0,0,100,0,3500,3500,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 9"),
+(3452601,9,4,0,0,0,100,0,3500,3500,0,0,1,12,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 12 (Tahu Sagewind)"),
+(3452601,9,5,0,0,0,100,0,5000,5000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 10"),
+(3452601,9,6,0,0,0,100,0,2000,2000,0,0,1,13,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 13 (Tahu Sagewind)"),
+(3452601,9,7,0,0,0,100,0,11000,11000,0,0,1,14,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 14 (Tahu Sagewind)"),
+(3452601,9,8,0,0,0,100,0,7000,7000,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 11"),
+(3452601,9,9,0,0,0,100,0,4000,4000,0,0,86,65631,0,19,34548,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Cross Cast 'Sunny'"),
+(3452601,9,10,0,0,0,100,0,5000,5000,0,0,1,12,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 12"),
+(3452601,9,11,0,0,0,100,0,2000,2000,0,0,1,13,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 13"),
+(3452601,9,12,0,0,0,100,0,8000,8000,0,0,1,14,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 14"),
+(3452601,9,13,0,0,0,100,0,8500,8500,0,0,1,15,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 15 (Tahu Sagewind)"),
+(3452601,9,14,0,0,0,100,0,8000,8000,0,0,1,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 15"),
+(3452601,9,15,0,0,0,100,0,4000,4000,0,0,1,16,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 16 (Tahu Sagewind)"),
+(3452601,9,16,0,0,0,100,0,0,0,0,0,28,0,0,0,0,0,0,19,34548,0,0,0,0,0,0,"Aponi Brightmane - On Script - Remove All Auras"),
+(3452601,9,17,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Set Event Phase 1");
+
+-- Add missing spawns
+SET @GUID1 := 16806;
+SET @GUID2 := 17553;
+DELETE FROM `creature` WHERE `guid` IN (@GUID1, @GUID2);
+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
+(@GUID1,34548,1,0,0,1,1,0,0,-1047.73,-287.61,159.03,5.93684,300,0,0,42,0,0,0,33554432,0,"",0), -- Invisible Spell Target - Tahu
+(@GUID2,34528,1,0,0,1,1,0,1,-1045.84,-288.282,159.03,2.8312,300,0,0,3137,2117,0,0,0,0,"",0); -- Tahu Sagewind
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/updates/world/4.3.4/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql
new file mode 100644
index 0000000000..c6e249907b
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql
@@ -0,0 +1,6 @@
+--
+SET @CGUID:= 42637; -- 1 guid
+
+DELETE FROM `creature` WHERE `guid` = @CGUID;
+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
+(@CGUID, 16031, 329, 0, 0, 1, 1, 0, 0, 4044.78, -3333.68, 117.26, 4.153883, 7200, 0, 0, 4120, 0, 0, 0, 0, 0, '', 0);
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/updates/world/4.3.4/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql
new file mode 100644
index 0000000000..54fa4fffdf
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` = 182947;
+UPDATE `gameobject` SET `spawnMask` = 2 WHERE `id` = 184222 AND `map` IN (553,554);
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/updates/world/4.3.4/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql
new file mode 100644
index 0000000000..ac78bfdc15
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE creature_template SET AIName='' WHERE entry=21909;
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/updates/world/4.3.4/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql
new file mode 100644
index 0000000000..ae558e0e23
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql
@@ -0,0 +1,19 @@
+/*
+--
+-- Change weapons of Commander Springvale to the correct pre-cataclysm ones
+UPDATE `creature_equip_template` SET `ItemID1`=5191, `ItemID2`=1201 WHERE `CreatureID`=4278 AND `ID`=1;
+
+-- Update Lupine Horror and Slavering Worg MovementType to stand still
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (16240, 16238);
+
+-- Add chain aggro to Worgs infront of Wolf Master Nandos
+DELETE FROM `creature_formations` WHERE `leaderGUID`=16241;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(16241, 16241, 0, 0, 3),
+(16241, 16240, 0, 0, 3),
+(16241, 16238, 0, 0, 3),
+(16241, 16239, 0, 0, 3);
+
+-- Add random movement to Razorclaw the Butcher
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid`=16253;
+*/
diff --git a/sql/updates/world/4.3.4/2017_12_28_00_world.sql b/sql/updates/world/4.3.4/2017_12_28_00_world.sql
new file mode 100644
index 0000000000..55d31c7127
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_12_28_00_world.sql
@@ -0,0 +1,12 @@
+--
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=49311;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=49043;
+UPDATE `gameobject` SET `spawnMask` = 1 WHERE `id` = 185434 AND `map` IN (0,1);
+UPDATE `creature_template` SET `maxgold` = 3360 WHERE `entry` = 37662;
+UPDATE `creature_template` SET `maxgold` = 5456 WHERE `entry` = 37031;
+UPDATE `creature_template` SET `maxgold` = 4747 WHERE `entry` = 37029;
+UPDATE `creature_template` SET `maxgold` = 4607 WHERE `entry` = 37028;
+UPDATE `creature_template` SET `maxgold` = 837154 WHERE `entry` = 36855;
+UPDATE `creature_template` SET `maxgold` = 18320 WHERE `entry` = 36829;
+UPDATE `creature_template` SET `maxgold` = 2673 WHERE `entry` = 36805;
+
diff --git a/sql/updates/world/4.3.4/2018_01_01_00_world_from_335_was_2017_12_27_00_world.sql b/sql/updates/world/4.3.4/2018_01_01_00_world_from_335_was_2017_12_27_00_world.sql
new file mode 100644
index 0000000000..3021baaba5
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_01_world_from_335_was_2017_12_28_00_world_335.sql b/sql/updates/world/4.3.4/2018_01_01_01_world_from_335_was_2017_12_28_00_world_335.sql
new file mode 100644
index 0000000000..db0b4bbea3
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_02_world_from_335_was_2017_12_28_01_world.sql b/sql/updates/world/4.3.4/2018_01_01_02_world_from_335_was_2017_12_28_01_world.sql
new file mode 100644
index 0000000000..bc082badcf
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_03_world_from_335_was_2017_12_28_02_world.sql b/sql/updates/world/4.3.4/2018_01_01_03_world_from_335_was_2017_12_28_02_world.sql
new file mode 100644
index 0000000000..8f580e7362
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_04_world_from_335_was_2017_12_28_03_world.sql b/sql/updates/world/4.3.4/2018_01_01_04_world_from_335_was_2017_12_28_03_world.sql
new file mode 100644
index 0000000000..c8012633a6
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_05_world_from_335_was_2017_12_28_04_world.sql b/sql/updates/world/4.3.4/2018_01_01_05_world_from_335_was_2017_12_28_04_world.sql
new file mode 100644
index 0000000000..c104e2668f
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_06_world_from_335_was_2017_12_28_05_world.sql b/sql/updates/world/4.3.4/2018_01_01_06_world_from_335_was_2017_12_28_05_world.sql
new file mode 100644
index 0000000000..a1d31371e4
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_07_world_from_335_was_2017_12_28_07_world.sql b/sql/updates/world/4.3.4/2018_01_01_07_world_from_335_was_2017_12_28_07_world.sql
new file mode 100644
index 0000000000..d9f92b5b98
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_08_world_from_335_was_2017_12_29_00_world.sql b/sql/updates/world/4.3.4/2018_01_01_08_world_from_335_was_2017_12_29_00_world.sql
new file mode 100644
index 0000000000..b6c0dd3bcb
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_09_world_from_335_was_2017_12_30_00_world.sql b/sql/updates/world/4.3.4/2018_01_01_09_world_from_335_was_2017_12_30_00_world.sql
new file mode 100644
index 0000000000..83465eb393
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_10_world.sql b/sql/updates/world/4.3.4/2018_01_01_10_world.sql
new file mode 100644
index 0000000000..a148d3c3c9
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_01_01_10_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `MovementType` = 0 WHERE `guid` = 82823;
diff --git a/sql/updates/world/4.3.4/2018_01_01_11_world_from_335_was_2018_01_01_00_world.sql b/sql/updates/world/4.3.4/2018_01_01_11_world_from_335_was_2018_01_01_00_world.sql
new file mode 100644
index 0000000000..109071ba4d
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_12_world_from_335_was_2018_01_01_01_world.sql b/sql/updates/world/4.3.4/2018_01_01_12_world_from_335_was_2018_01_01_01_world.sql
new file mode 100644
index 0000000000..32bd6c76e6
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/updates/world/4.3.4/2018_01_01_13_world_from_335_was_2018_01_01_02_world.sql b/sql/updates/world/4.3.4/2018_01_01_13_world_from_335_was_2018_01_01_02_world.sql
new file mode 100644
index 0000000000..892dc41990
--- /dev/null
+++ b/sql/updates/world/4.3.4/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/src/CMakeLists.txt b/src/CMakeLists.txt
index 48839d5907..27a5495b3d 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 3e238a8c36..65cd3c5bdb 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 448025c2c9..78070f3e17 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 a80759f6cf..c9d95f8736 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 b7f78ea7ba..adbc6754fa 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 fc79978be3..750e155da8 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 4ba30e14e4..7dd7b14908 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 a89fefa9d6..3f5282c0e3 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 64948956c7..240dbc6063 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 770cec1bf1..a8d6d0473a 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 d83339fb17..e2d082474d 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 a0fc8a0bd7..27133ed3e0 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 f36f237c4b..b195955c4a 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 50c1c57e79..e53c37a5a4 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 f74fe2b895..297e405309 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 f874afdf5d..110f2bd12f 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 1fc9682d5d..5f85a08aae 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 3a0e872c74..0c99534dda 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 3cb60cf7a3..84e759383f 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 ae0585dbd5..f370bb638b 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 2ae3159a91..9643f02907 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 5603b2eb79..e0de8ea7a1 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 beb9f96552..8e6c96e839 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 3390b233c8..a2c62bc565 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 3036ac1011..80118b9a9c 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 d04bcf4d24..4bbf0d9a05 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 df47270820..5ff3300b84 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 5af52770dd..22885ec385 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 b73e524ce5..7cbd5b8ff0 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 e1a5f5811d..8b1891737f 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 20c442f4c0..3fdece63d1 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 0509dcf917..115a1b5329 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 8ccfabbd51..936cb2f067 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 cc21555f4b..f27f15ce19 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 be05916e80..4eb663ae3c 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 1e0f558b00..c2600b4058 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 1a568f9970..cc10dc39c9 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 3683d17960..4f7fba1f31 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 210a5fcb64..b5393e3655 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 037e10613f..af514d579a 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 941526d303..ba57285864 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 7759496f08..104ebb1082 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 3225da5bb3..6958870985 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 19b3884b06..30b7e5cea3 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 02ad85185f..f12fb0f26d 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 b833afca99..bf744e5b91 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 7a97cc2375..cb1cf17c1c 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 9fc1311929..100a1c4eb3 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 3234663f86..4b3561cbb1 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 cb3297377a..ad564c6d61 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 abb254d7f3..b484c96db3 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 14aa04ff01..40ea275003 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 89fb4eb8de..08c6f3470b 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 2e67f3bf53..731a779344 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 c21972af90..867040ed82 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 3223607d19..657ce5886a 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 c1aa331b0a..eac3d9d186 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 9a31b3f1a6..b4e29cbd54 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 ec88d5fd4c..311308bf7d 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 6a9932b793..b8c3c119ec 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 3378c185cc..76658eea8f 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 c56a745bfb..c175aa3ebe 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 6c68406667..df8b44b3c8 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 aeb1c2d800..295ff850f4 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 278dc23a40..0750c5e934 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 fa67a8ea64..bd91866784 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 81bb98b9cc..99740d97af 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 d69cd7eb0b..641eca9268 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 8e1f9c7ef9..5ca4e597cd 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 1446062c22..63d2cb4dfc 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 b04fa645b6..058c3a9311 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 82befe803e..91a0210c90 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 230fdaf17e..558950974d 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 b8662d5f98..1e64c01701 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 286ed5509a..f11f208a65 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 cc07be8a4a..85e2ac4e4f 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 b4ff3f5ecf..cd17d4c012 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 925f5d2d8e..6b7f65b027 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 18047d0d3a..e72e72fe68 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 a07b7f876a..db762a67d0 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 5fa90dc14a..91372618f6 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 d4ea70174c..d797651342 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 edcc7a6445..65f8bd02da 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 07fce187ad..40dc745a30 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 3b924dbb3e..ee15fdb507 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 894e1637a7..94689bccdd 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 18ceb68f17..f89fd5b07b 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 3a0cdedcf4..f4902c5171 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 ded0a6c6e5..9e13e7cd7e 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 1d1ebca1b1..f9c1cffc43 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 6f4676232c..8a88364136 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 120c4f26ea..6e91242222 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 7f41b50132..494597f5e7 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 730ef8d4b8..50e7198fe9 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 d6c399639b..2783299285 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 e774808bcb..29f49fa594 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 37742e5c67..4eed82fde5 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 70d7c97ef2..654e3b4018 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 390a725f0d..e722f01360 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 473e93afc8..ed4be76a1a 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 8299cc1093..ea017bd0cb 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 b743a9bd92..80efec90c4 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 e26fd47e16..2d7e39d35a 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 94a3383e83..d490fb44f5 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 206749b702..9f16b6853e 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 6e67a95034..2b0987e82f 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 02400f0d45..d308bd432d 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 12b0ca6a8f..d3c199cac0 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 fdcb8072e7..781fb09e5c 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 4e634169de..a8270e06ea 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 947d1c5bcc..102562a465 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 16b7fe3273..febb38b93a 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 9fdeab3f4a..5bd52531a3 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 e71dba2b82..ae9cd9270f 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 df7eddeb47..c954facf33 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 d7cc5b13ef..b9e029438b 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 1de3067933..5b2dfa55f4 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 b266c31c6f..777bd4afbc 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 32623d3709..4a744bc816 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 f096d2fb87..78bf5eacb9 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 5a75d78c60..081eeb55be 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 4681507200..ce3215650f 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 4803b7a3fb..606a994bda 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 1fc067f489..2063300ce3 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 29b5202fff..6c2d698a79 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 d3bff3d96b..3d6cb2c7ee 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 629391eccc..3daeaa3867 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 3a09d0a282..c7f572e66b 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 83f6be1e70..6782c1f15e 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 c7e92137fc..e55b1ee7bc 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 5f8c7ae465..48de776342 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 5191a4484f..5a878955a5 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 46633276b1..f178c499fa 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 16c0806880..ea55a93f46 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 6e762c8b06..ad7bd29948 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 b526ee4a35..46c5441ef6 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 31991c8aef..26e2c2010c 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 4490f6e140..8b0ca97279 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 87dc881919..4802004025 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 4e8130a65f..93c9ff6b80 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 3526f74067..c865116c1d 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 2e463ab341..485fb41501 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 17cd1f8530..dcee586f10 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 38b37fce23..a04937e191 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 58d0a00f8a..4d4311673a 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 dc9a5b52af..b21dabbc40 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 8474200299..dc72c75d78 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 866e78ea3d..0766a37815 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 f29bcf6f01..d1031a1191 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 d4172a5c53..e16d013ac8 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 3f8878ce74..919021a0bc 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 2b8e258436..6c90107df1 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 0e8bd80c3b..739ee15411 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 644af01787..dfa4da4ead 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 e419908d17..1ddaea3ddf 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 21b937d3c7..4ab9054c1c 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 dde0d5f184..bb63c2e913 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 31e4b63f46..c40b50f40f 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 472a6811f3..ed0caab26b 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 5498086386..605b11a163 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 3844470665..823287fe22 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 fca4f66631..a001954d09 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 b1be44adf3..e746e9e01f 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 29326287e6..5ab505058b 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 b5eefeeb5b..e6ae8821b1 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 e9bae4bcb4..882a1de63f 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 60a32afd32..77f964cd85 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 8bf129bfc8..0aed48ac91 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 b138db3de4..bf9721b8c7 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 e1943131e8..689f8169ae 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
diff --git a/src/server/database/Database/Implementation/WorldDatabase.h b/src/server/database/Database/Implementation/WorldDatabase.h
index 069f5fe055..3a0a488e0f 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 6e862ae6ab..8451ca2381 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 81b5726189..ff9b29dcd0 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 68a8c3ea7e..1e46c7ffd5 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 a46a022df4..f1bfa10130 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 33ef04287c..5f740daa4d 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 2d89e08a95..d7b3332e95 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 f9c93000da..bf167a2ce2 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 9f8b8fc4ad..a0982b7c1c 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 0b06fd8fc2..d5ff959a32 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 6a8bb701a1..0498c67a89 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 c3ebb33068..ffd7cc2bef 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 7b6937e50b..c1aaf869e9 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 cbbfd08b53..59363813ba 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 1e3000600c..0bedccaa68 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 52f7062c78..a8cb502e68 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 6e6d68302f..646b01274d 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 1a6e11209e..5fc739b285 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 56f5fc13b9..ef703a21cf 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 afc3186b65..2a83f984e9 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 191091cd85..3d3576d986 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 fdc00c9d6b..b80d0f8368 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 1da370ee7b..a6656c46af 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 51f735e797..07249e0799 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 e10592426d..2e42e18660 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 86e95e0b20..905e1f3e8f 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 204f4c1627..2e927e3538 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 84ead51cc9..02e0b03625 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
@@ -25,6 +25,7 @@
#include "QuestDef.h"
#include "GameObject.h"
#include "CreatureAI.h"
+#include "ObjectGuid.h"
class TC_GAME_API GameObjectAI
{
@@ -42,8 +43,8 @@ class TC_GAME_API GameObjectAI
// Pass parameters between AI
virtual void DoAction(int32 /*param = 0 */) { }
- virtual void SetGUID(uint64 /*guid*/, int32 /*id = 0 */) { }
- virtual uint64 GetGUID(int32 /*id = 0 */) const { return 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 1da03952dc..0b3be44b1e 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 ef35dca6e3..4ab4cc4469 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 abbff7a870..33a2a02a43 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 687434559a..93b2577e9f 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 b4cd98f1f3..2283616df7 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)
@@ -551,6 +548,8 @@ bool PetAI::CanAttack(Unit* target)
return false;
}
+ ASSERT(me->GetCharmInfo());
+
// Passive - passive pets can attack if told to
if (me->HasReactState(REACT_PASSIVE))
return me->GetCharmInfo()->IsCommandAttack();
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index bf62aff301..d8b4002293 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 8ad251776b..e0f0c2ab8a 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 443f54a284..6020d05214 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 2794bbcf6d..0bd193b01f 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 60f27f7721..fd2cabf027 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 055abc99d9..6bd4cfac3b 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 42f7cd6a63..f55edff471 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 218d60db1d..74b761f910 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 a0f5284f0c..dc9483f762 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 6681ba8bc8..c6f9e9f1ef 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 7b2ecfd7f4..bdd9c624f0 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 c62d20bfe4..ef7ecce041 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 1a62699af6..c8f7c53678 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 30b606b49c..17a9431a94 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 501a39eaa8..a7eda952ac 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 2ff799ab7e..b7d88529e2 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 e1c99b4f7a..ab7a0f0a78 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 4e93d16678..166bf37d8e 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 b3c42103d6..e1a02996c8 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 b4db664a98..530fe72576 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 cdbfcd8fb1..0105c03439 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 e1bf3af534..687e352c7e 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 79c3c17d61..91786534cd 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 6b5b06490f..abf49355e1 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 b979051e94..7cb0fe722d 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 b9f9e0f26e..97ee7f44bb 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 0000000000..9998bc2249
--- /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 970b5718cd..d106afad44 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
@@ -603,7 +603,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 +762,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
{
diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
index d8aa4164d0..8ef230193f 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;
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index d3f5718116..595befc3a0 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
diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h
index efc6c5d3de..92875010c7 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
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
index a23ad8870e..3297b8c4a3 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
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
index 9e4dfc1a8b..85ed42a51c 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
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index cd4ccc415a..edc29652ff 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 deb473bc97..0a6f6b4c02 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 a8d83d5390..54058624df 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 7bcbcc4bb8..f41f46bd2f 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 951223a925..8c9f01acfe 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 d18caf838a..928fe49779 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 689e37076b..652a36c9bd 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 553f61ca34..29965c6676 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 7371cfb5f4..3d199cef2c 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 9b829288ab..dd8b960a48 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 b5b0c3b335..29f2bd6423 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 1e54a6edb1..abee377232 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 5643465212..65c976550e 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 11e5aa177f..53165663a4 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 8396ab9462..1abf495a46 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 ba4326ffab..c6616dcb09 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 d0d7cd3fd8..149a3e7737 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 fe6fda33d4..a284c3e11f 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 92ac296cd6..a703c70d30 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 fc4ffd05c0..b04d6e2837 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 3825201ef2..88564ed12c 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 dc9d50f6ed..ec8fe41b7b 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 0bd2cf4d2e..a2f2d77239 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 dbdacf6448..16e276543d 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 2e33b665cb..b7ad251c0a 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 7921ef1ab7..38b7ca44f6 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 5a860db8de..a739507d4b 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 7242a5ba03..dc4dc662bd 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 763841e221..805b41e1ef 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 f95e2a8958..bd8141bed4 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 d4b1088577..efc9109cef 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 74fbb2a0fa..349b00cd48 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 fc658542ed..052b8f5e51 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 03298abe71..f79aeec076 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 1e42700942..382b775c9a 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 32288ae0fe..182218af93 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 fcfb662a4a..5adb3675c4 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 991319fb1c..f5596b94cc 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 0ae959cea8..41b7916dda 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 8b401cbe60..b90a06c6cc 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 c3836a3330..c9669271da 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 b60d4d03e7..7587f3fda8 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 40bef0af09..30ca2f94a6 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 52accb5744..6e54a5b3ed 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 21e041fafe..dbdc0cc86c 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 c7a9a37e59..018389e92a 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 19868190c8..bb02e67112 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 0dc77c0301..e72a1ee841 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 e4940add01..027f2ee448 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 f55c8fedd0..c5727f67dd 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 5003f74a5a..b7a72e26f9 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 d2300704b1..100d456080 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 3c9904e62c..6db5c73a4f 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 9dcd606c45..bab8035788 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 d4380b043d..0186b1e8e7 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 60c32a253d..b860e83c56 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 be508ee3c9..a240bb8eab 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 2f20265e07..c122b1c56e 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 35fb94b3cc..54e84dd8a7 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 e72ca01086..d665787350 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 c536e171a8..a52235a723 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 ec940f7d78..7d72a697f7 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 38f73630a2..c50019a686 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 1a9d83fffa..cbb06e3371 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 d98686a089..94f8094fe6 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 5ae782d304..589179047b 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 e643602ec1..7f7f685377 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 205d737eff..fd3dcf9c69 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 1f62e970fd..3de5e5cf93 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 710d0c624b..570ad2afe5 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 75acb50196..80ad3b28e5 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 10ef7a0398..036074d49e 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 299e664d71..113803fd47 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 03daf416f3..6de6bb24c0 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 4502913a16..dbb3a32b04 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 ff1c7d6fd3..3133d78ec8 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 e532f33845..0c4deab3b3 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 8b8e15b813..7b6cb6ebe9 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 bc92417793..b7cf6cff20 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 2fd36fa1b6..e8d53f2396 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 54b02c6a97..eea3e0f8d1 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 3d42bfd9b3..585d96b744 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 2bf8132a40..8d7b015fa7 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 e17a6926ff..95230f335b 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 35b7e7ecb5..e5b89dabc4 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 60a894ddde..9f2a16f3a9 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 64b0e4dd91..af15d3947c 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 c121cb2c15..80665bf781 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 c7172b2ec2..04a77c8c3a 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 4571ecd5ef..a47b10ae5f 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 f18313b1df..3a56e7c133 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 c75f491b25..78faddb7d1 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 d2a2ae9327..8b411382a5 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 fb072733e5..d02cd5af07 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 2a93220066..f4c52ef810 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 5e5b9da5cc..21f2a4a5d6 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 821cacebae..e71768912f 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 0e2e32e552..05833b0552 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 f559f5294b..c716cbffa7 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
@@ -1937,7 +1937,7 @@ struct SkillRaceClassInfoEntry
uint32 RaceMask; // 2 m_raceMask
uint32 ClassMask; // 3 m_classMask
uint32 Flags; // 4 m_flags
- //uint32 Unk; // 5 m_unk
+ uint32 Availability; // 5 m_availability
//uint32 MinLevel; // 6 m_minLevel
uint32 SkillTier; // 7 m_skillTierID
//uint32 SkillCostType; // 8 m_skillCostIndex
@@ -2577,17 +2577,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 eba288a9fa..6579465c1a 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
@@ -134,7 +134,7 @@ char const ScalingStatDistributionfmt[] = "niiiiiiiiiiiiiiiiiiiixi";
char const ScalingStatValuesfmt[] = "iniiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
char const SkillLinefmt[] = "nisxixi";
char const SkillLineAbilityfmt[] = "niiiixxiiiiiii";
-char const SkillRaceClassInfofmt[] = "diiiixxix";
+char const SkillRaceClassInfofmt[] = "diiiiixix";
char const SkillTiersfmt[] = "nxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiii";
char const SoundEntriesfmt[] = "nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
char const SpellCastTimefmt[] = "nixx";
diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp
index 3c8e62d976..2812b0dd74 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 b0948d227a..bcd16cf7cf 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 9c01408f44..269c1f3acd 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 497db7fd74..2c8da3941b 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 fd9e3a2bf1..ad690e13e1 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 b0df03c0b1..cb4dcb8a1e 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 4f21c1f263..ddc3f7fbe7 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 eef9891d6f..c173c20af0 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 3924403bed..6a9f19d5a5 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 f55315ef5a..d32a3d3430 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 356a0bb315..deb689ebc6 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 8ece5ba91f..c053586e23 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 e4aa866bd0..4c3d7cff81 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 0286444a2a..0f88dd29d7 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 761f2d8fa0..0cc037ac4e 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 7700cd0b64..e362e1d555 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 4a1c6031bf..4b63c7a7cd 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 2337bc4b57..f7be38c88e 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 c7768e2f92..72cac1255f 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 0f60dda7e2..afd7b2071f 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
@@ -2610,12 +2610,6 @@ void Creature::SetPosition(float x, float y, float z, float o)
GetVehicleKit()->RelocatePassengers();
}
-bool Creature::IsDungeonBoss() const
-{
- CreatureTemplate const* cinfo = sObjectMgr->GetCreatureTemplate(GetEntry());
- return cinfo && (cinfo->flags_extra & CREATURE_FLAG_EXTRA_DUNGEON_BOSS);
-}
-
float Creature::GetAggroRange(Unit const* target) const
{
// Determines the aggro range for creatures (usually pets), used mainly for aggressive pet target selection.
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 93c3b490d3..32cf1c234d 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
@@ -502,6 +502,8 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma
bool CanWalk() const { return (GetCreatureTemplate()->InhabitType & INHABIT_GROUND) != 0; }
bool CanSwim() const { return (GetCreatureTemplate()->InhabitType & INHABIT_WATER) != 0 || IsPet(); }
bool CanFly() const override { return (GetCreatureTemplate()->InhabitType & INHABIT_AIR) != 0; }
+ bool IsDungeonBoss() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_DUNGEON_BOSS) != 0; }
+ bool IsAffectedByDiminishingReturns() const override { return Unit::IsAffectedByDiminishingReturns() || (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH) != 0; }
void SetReactState(ReactStates st) { m_reactState = st; }
ReactStates GetReactState() const { return m_reactState; }
@@ -518,8 +520,6 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma
bool isElite() const;
bool isWorldBoss() const;
- bool IsDungeonBoss() const;
-
uint8 getLevelForTarget(WorldObject const* target) const override; // overwrite Unit::getLevelForTarget for boss level support
bool IsInEvadeMode() const { return HasUnitState(UNIT_STATE_EVADE); }
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 87b22012a8..7c16538e33 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 0b06d4bb14..41dff79718 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 d257978ba7..4d0df8b3b7 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 da94463f65..91b95dff40 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 0b4a81d455..b6cfb855f1 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 b98533849e..40d2ffc090 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 458672227f..dee0038150 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 48ce217964..1f748fef06 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 7f31215a4d..3da93a3553 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 fb533d176d..d9ce62e1bb 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
diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
index 513610a5dd..89fc7ed910 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 9278bb1693..867c099882 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 679b644aec..5843903e61 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 a29531f236..124125b934 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 3fe8b4086a..84794b0aa4 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 da727a72ab..54bd78d863 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 8ee2a464f5..14b7f286c6 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 780307663e..6a723a2600 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 340c0675af..66a9a642fb 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 de64babcd1..a2e8e276d4 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 8c2735502b..e8455f6b1b 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 972bae7939..dd25eab42d 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 ba93f60399..0482fd5d0b 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 bfb3022a2b..22c3dc9916 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 d5414e0e24..231978b618 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 c9e6ea6eee..e9feaded99 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 46c8d4874e..eb1a2ea1bb 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 bab870de27..c2da619aa6 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 5d9a5c0de8..bbc42b8414 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 c14926d4a5..e732faf1f3 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 122d00e2fd..32f03e15df 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 7d67269cb0..d79d044879 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 18e26cd755..50de0a8b5b 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 7dbcced435..16b405310b 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
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index 522d7d4708..45796d5793 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 4d1f6ab0d7..dd359dc6ee 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 95a4a08a33..58b2dee988 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 f1a333311b..e141a50e81 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 82791382b4..d2f56d4769 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 e441f50462..878a5c9250 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 309221dfee..e3ea1e2669 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
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index d2fb52635d..22d1a29b6e 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 7273002fea..59e2d890b5 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 b8482ecc9f..4f47bbe631 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 be7c80788e..bce76f6930 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 642a360416..915d786e0c 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 14a0ca1f19..3c14fea8b3 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 8a0edb1943..4a096f16a9 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 4aedd04716..ba0524c214 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 95fd6c191a..03bd3bcb2c 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 f01b613e2b..f26cf8a5ef 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 6ada4f573a..310d1e515b 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
@@ -4481,17 +4481,6 @@ bool Unit::HasNegativeAuraWithInterruptFlag(uint32 flag, ObjectGuid guid) const
return false;
}
-bool Unit::HasNegativeAuraWithAttribute(uint32 flag, ObjectGuid guid) const
-{
- for (AuraApplicationMap::const_iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end(); ++iter)
- {
- Aura const* aura = iter->second->GetBase();
- if (!iter->second->IsPositive() && aura->GetSpellInfo()->Attributes & flag && (!guid || aura->GetCasterGUID() == guid))
- return true;
- }
- return false;
-}
-
bool Unit::HasAuraWithMechanic(uint32 mechanicMask) const
{
for (AuraApplicationMap::const_iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end(); ++iter)
@@ -4509,6 +4498,26 @@ bool Unit::HasAuraWithMechanic(uint32 mechanicMask) const
return false;
}
+bool Unit::HasStrongerAuraWithDR(SpellInfo const* auraSpellInfo, Unit* caster, bool triggered) const
+{
+ DiminishingGroup diminishGroup = auraSpellInfo->GetDiminishingReturnsGroupForSpell(triggered);
+ DiminishingLevels level = GetDiminishing(diminishGroup);
+ for (auto itr = m_appliedAuras.begin(); itr != m_appliedAuras.end(); ++itr)
+ {
+ SpellInfo const* spellInfo = itr->second->GetBase()->GetSpellInfo();
+ if (spellInfo->GetDiminishingReturnsGroupForSpell(triggered) != diminishGroup)
+ continue;
+
+ int32 existingDuration = itr->second->GetBase()->GetMaxDuration();
+ int32 newDuration = auraSpellInfo->GetMaxDuration();
+ ApplyDiminishingToDuration(auraSpellInfo, triggered, newDuration, caster, level);
+ if (newDuration > 0 && newDuration < existingDuration)
+ return true;
+ }
+
+ return false;
+}
+
AuraEffect* Unit::IsScriptOverriden(SpellInfo const* spell, int32 script) const
{
AuraEffectList const& auras = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
@@ -8304,7 +8313,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);
@@ -9458,31 +9467,28 @@ void Unit::ModSpellDurationTime(SpellInfo const* spellInfo, int32 & duration, Sp
duration = int32(float(duration) * m_modAttackSpeedPct[RANGED_ATTACK]);
}
-DiminishingLevels Unit::GetDiminishing(DiminishingGroup group)
+DiminishingLevels Unit::GetDiminishing(DiminishingGroup group) const
{
- DiminishingReturn& diminish = m_Diminishing[group];
+ DiminishingReturn const& diminish = m_Diminishing[group];
if (!diminish.hitCount)
return DIMINISHING_LEVEL_1;
- // If last spell was cast more than 15 seconds ago - reset the count.
+ // If last spell was cast more than 15 seconds ago - reset level
if (!diminish.stack && GetMSTimeDiffToNow(diminish.hitTime) > 15000)
- {
- diminish.hitCount = DIMINISHING_LEVEL_1;
return DIMINISHING_LEVEL_1;
- }
return DiminishingLevels(diminish.hitCount);
}
void Unit::IncrDiminishing(SpellInfo const* auraSpellInfo, bool triggered)
{
- DiminishingGroup const group = auraSpellInfo->GetDiminishingReturnsGroupForSpell(triggered);
- DiminishingLevels const maxLevel = auraSpellInfo->GetDiminishingReturnsMaxLevel(triggered);
+ DiminishingGroup group = auraSpellInfo->GetDiminishingReturnsGroupForSpell(triggered);
+ uint32 currentLevel = GetDiminishing(group);
+ uint32 const maxLevel = auraSpellInfo->GetDiminishingReturnsMaxLevel(triggered);
- // Checking for existing in the table
DiminishingReturn& diminish = m_Diminishing[group];
- if (static_cast(diminish.hitCount) < maxLevel)
- ++diminish.hitCount;
+ if (currentLevel < maxLevel)
+ diminish.hitCount = currentLevel + 1;
}
bool Unit::ApplyDiminishingToDuration(SpellInfo const* auraSpellInfo, bool triggered, int32& duration, Unit* caster, DiminishingLevels previousLevel) const
@@ -9503,9 +9509,7 @@ bool Unit::ApplyDiminishingToDuration(SpellInfo const* auraSpellInfo, bool trigg
Unit const* target = targetOwner ? targetOwner : this;
Unit const* source = casterOwner ? casterOwner : caster;
- if ((target->GetTypeId() == TYPEID_PLAYER
- || target->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH)
- && source->GetTypeId() == TYPEID_PLAYER)
+ if (target->IsAffectedByDiminishingReturns() && source->GetTypeId() == TYPEID_PLAYER)
duration = limitDuration;
}
@@ -9527,10 +9531,9 @@ bool Unit::ApplyDiminishingToDuration(SpellInfo const* auraSpellInfo, bool trigg
}
}
// Some diminishings applies to mobs too (for example, Stun)
- else if ((auraSpellInfo->GetDiminishingReturnsGroupType(triggered) == DRTYPE_PLAYER
- && ((targetOwner ? (targetOwner->GetTypeId() == TYPEID_PLAYER) : (GetTypeId() == TYPEID_PLAYER))
- || (GetTypeId() == TYPEID_UNIT && ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH)))
- || auraSpellInfo->GetDiminishingReturnsGroupType(triggered) == DRTYPE_ALL)
+ else if (auraSpellInfo->GetDiminishingReturnsGroupType(triggered) == DRTYPE_ALL ||
+ (auraSpellInfo->GetDiminishingReturnsGroupType(triggered) == DRTYPE_PLAYER &&
+ (targetOwner ? targetOwner->IsAffectedByDiminishingReturns() : IsAffectedByDiminishingReturns())))
{
DiminishingLevels diminish = previousLevel;
switch (diminish)
@@ -11837,8 +11840,8 @@ void Unit::SetStunned(bool apply)
SetTarget(ObjectGuid::Empty);
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
- // Stop movement if a player is affected by point motion master
- if (GetTypeId() == TYPEID_PLAYER && GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
+ // Stop movement if unit is affected by point motion master
+ if (GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
StopMoving();
if (GetTypeId() == TYPEID_PLAYER)
@@ -11873,8 +11876,8 @@ void Unit::SetRooted(bool apply, bool packetOnly /*= false*/)
// setting MOVEMENTFLAG_ROOT
RemoveUnitMovementFlag(MOVEMENTFLAG_MASK_MOVING);
AddUnitMovementFlag(MOVEMENTFLAG_ROOT);
- // Stop movement if a player is currently affected by point motion master
- if (GetTypeId() == TYPEID_PLAYER && GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
+ // Stop movement if unit is affected by point motion master
+ if (GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
StopMoving();
}
else
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 5ea863a88d..408fb5743c 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
@@ -1315,7 +1315,8 @@ class TC_GAME_API Unit : public WorldObject
void CleanupBeforeRemoveFromMap(bool finalCleanup);
void CleanupsBeforeDelete(bool finalCleanup = true) override; // used in ~Creature/~Player (or before mass creature delete to remove cross-references to already deleted units)
- DiminishingLevels GetDiminishing(DiminishingGroup group);
+ virtual bool IsAffectedByDiminishingReturns() const { return (GetCharmerOrOwnerPlayerOrPlayerItself() != nullptr); }
+ DiminishingLevels GetDiminishing(DiminishingGroup group) const;
void IncrDiminishing(SpellInfo const* auraSpellInfo, bool triggered);
bool ApplyDiminishingToDuration(SpellInfo const* auraSpellInfo, bool triggered, int32& duration, Unit* caster, DiminishingLevels previousLevel) const;
void ApplyDiminishingAura(DiminishingGroup group, bool apply);
@@ -1598,7 +1599,9 @@ class TC_GAME_API Unit : public WorldObject
void CastSpell(SpellCastTargets const& targets, SpellInfo const* spellInfo, CustomSpellValues const* value, TriggerCastFlags triggerFlags = TRIGGERED_NONE, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty);
void CastSpell(Unit* victim, uint32 spellId, bool triggered, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty);
+ void CastSpell(std::nullptr_t, uint32 spellId, bool triggered, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty) { CastSpell((Unit*)nullptr, spellId, triggered, castItem, triggeredByAura, originalCaster); }
void CastSpell(Unit* victim, uint32 spellId, TriggerCastFlags triggerFlags = TRIGGERED_NONE, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty);
+ void CastSpell(std::nullptr_t, uint32 spellId, TriggerCastFlags triggerFlags = TRIGGERED_NONE, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty) { CastSpell((Unit*)nullptr, spellId, triggerFlags, castItem, triggeredByAura, originalCaster); }
void CastSpell(Unit* victim, SpellInfo const* spellInfo, bool triggered, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty);
void CastSpell(Unit* victim, SpellInfo const* spellInfo, TriggerCastFlags triggerFlags = TRIGGERED_NONE, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty);
void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item* castItem = nullptr, AuraEffect const* triggeredByAura = nullptr, ObjectGuid originalCaster = ObjectGuid::Empty);
@@ -1840,8 +1843,8 @@ class TC_GAME_API Unit : public WorldObject
bool HasAuraTypeWithAffectMask(AuraType auratype, SpellInfo const* affectedSpell) const;
bool HasAuraTypeWithValue(AuraType auratype, int32 value) const;
bool HasNegativeAuraWithInterruptFlag(uint32 flag, ObjectGuid guid = ObjectGuid::Empty) const;
- bool HasNegativeAuraWithAttribute(uint32 flag, ObjectGuid guid = ObjectGuid::Empty) const;
bool HasAuraWithMechanic(uint32 mechanicMask) const;
+ bool HasStrongerAuraWithDR(SpellInfo const* auraSpellInfo, Unit* caster, bool triggered) const;
AuraEffect* IsScriptOverriden(SpellInfo const* spell, int32 script) const;
uint32 GetDiseasesByCaster(ObjectGuid casterGUID, bool remove = false);
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index f9b4d82758..e39aef40ce 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 08f3e7f8f1..2b0022637b 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 298d5b4832..9e4b90beb4 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 b0711c9caf..72790a87a8 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
@@ -1719,7 +1719,7 @@ void GameEventMgr::SetHolidayEventTime(GameEventData& event)
if (!event.holidayStage) // Ignore holiday
return;
- const HolidaysEntry* holiday = sHolidaysStore.LookupEntry(event.holiday_id);
+ HolidaysEntry const* holiday = sHolidaysStore.LookupEntry(event.holiday_id);
if (!holiday->Date[0] || !holiday->Duration[0]) // Invalid definitions
{
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 77b1a8c4f4..de1f09dc24 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 576c86c94b..1fbe8c9924 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 ef40af9e53..fcebdac8ef 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 713dc43f4c..a93067470b 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
@@ -899,16 +899,30 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
ok = true;
}
- if (cInfo->AIName == "TotemAI")
+ if (cInfo->mingold > cInfo->maxgold)
{
- 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();
+ TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has `mingold` %u which is greater than `maxgold` %u, setting `maxgold` to %u.",
+ cInfo->Entry, cInfo->mingold, cInfo->maxgold, cInfo->mingold);
+ const_cast(cInfo)->maxgold = cInfo->mingold;
}
- if (!cInfo->AIName.empty() && !sCreatureAIRegistry->HasItem(cInfo->AIName))
+ if (!cInfo->AIName.empty())
{
- 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);
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 357d0d5cf5..f89f122bcb 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 9d28ac86bd..14b37db9f2 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 481469f584..5d8f960e38 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 9bdaedc0fb..b4188b57b3 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 2c07facca9..356efece2d 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 06bda25d42..81bfc7c27b 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 e3fda52b3f..9afd611ceb 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 69d17b4d8c..be8463325c 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 2d00c9db18..9f54aa505a 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 364407cbb5..5f2237718d 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 986f083c05..ec5f7942ca 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 d0fd14fa53..3ff20024d3 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 baf23052ea..0de5aeb84e 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 0ea65a2cba..9f29511fc1 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 83bad9c8e2..f8b14bec41 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 c83a6e7a2d..d20627f3cb 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 def4c89e5a..d46d4a35d5 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 49701f41da..93629bd0b1 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 1d0714bdf3..371928fb5b 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 3cd5d080b0..47b463ac34 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 abab0c1968..03ab969d90 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 b56354d397..5ee7aefac4 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 649f229b08..8c7acfc58f 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 e581a7a8c1..c28e31b095 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 28047ae0d3..b2d9f764c2 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 8962d76651..b6df2a89eb 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 427582c5f5..dd4db89799 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 ab994c6fd2..e055e37487 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 db030cb88d..bcf229e9ce 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 cb25f7bcee..9e19dcb3ed 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 f75958182f..a6288f7dea 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 5e48262bda..9cfbf0b793 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 43e81eb8b3..e43018b55c 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 1da730d627..cc880a1822 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 da1f3f4f88..ba68a63ce9 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 5f3edd3d33..be88002b82 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 9d47a2071a..9658cdcf96 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 1d0bb10716..ab056bddb5 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 ef5d2e70a7..0e9d1a8ead 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 cc29ae6de5..c0296a7911 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 894f6233c6..375e1b1afa 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 52513106e7..77b38db670 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 563de9b049..a3be11ee4d 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 0d9b973fe7..03e42e3076 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 d5de8c86fa..c049af203b 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 c820071875..fd1ed97765 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 8687b77a4d..a1f2d252c1 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 f993dc060b..b2ba687745 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 378d57ae6f..ac2154396b 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 1689b8efea..b7b0c0dede 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 6960d20246..354a3376fd 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 b4d5583c0c..41bbeea955 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 a1c49079c5..163eeebc1c 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 48fbbc6c71..3592ec07e4 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 4d75ecc0e9..05153d7b69 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 2018815b0e..068681af90 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
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 61e59a3344..0cccae34df 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 a10744929d..d4dd308eec 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 d5d220eb65..1ebfcef96c 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 be31907cc9..29bdf795e3 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 fcfce3ee5a..003fae7891 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 761413b276..4ece77add2 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 a49371c6ca..7df32606b7 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 859b85551d..5763b92de9 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 93ec5c50b6..5abc416415 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 138320f8de..378eab0eab 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 a735547e71..0813bc173c 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 71a70f1347..7f173225fb 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 6d3728e4fc..1697413ae0 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 081279e701..dab0766b5e 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 085a9694fc..d882c92f54 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 c83c3ddf9f..689d7c12df 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 4cf2e58934..e4e66cd416 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 fe642aae1e..ede5b5c5eb 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 0f80844a14..5f74d5e717 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 6ed21ec50f..a6e0071b31 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 dab73e9b51..2805ef1016 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 c98519a727..22a7bc098d 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 e8071c9e02..d42cb18a6e 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 d54e758e58..e1169c22d2 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 2394aa2035..dccb6cee9a 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 5299dcf646..a3bf5179a6 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 4418517045..ca75b7382f 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 52f7bddfcb..92b2135201 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 946c650d61..f0bb4ec7f9 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 d3743fdcac..44b22c8529 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 8bc8c120ce..2a69168ccf 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 682e5407ad..1c4888a2a1 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 63543ad1e3..cd3bdb5902 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 4e2840c8d2..4038d213b3 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 75fb56e555..26633cf33c 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 a4473cab80..48078b9610 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 41b350ab4c..88a00419c5 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 7637969526..22860cdea5 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
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index 80ea59a783..53ed9acf6c 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 69482ba7f5..9921b9bb5e 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 0da6a6ea77..c7af0f1364 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 ddf87fdda6..0a0a0a9039 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 b8ae7af829..8d4242923f 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 eb2c1312d0..8f2a8f1fe9 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 8f75e3a236..e35fc77251 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 3488de8534..86c17d4dbf 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 48524d9c66..1c8e66e8c2 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 95ba375de2..f5d5bf62fa 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 600aae8f8b..8fdbd03ec8 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 e75240929d..d33ec358da 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 6bd2ba9377..e17a63a696 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 4674f99b3d..b1a6064c0e 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 9590956188..86c99cb060 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 076ecd9130..f282af1dfc 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 5414ed96f6..fdab55e29a 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 0cdaf51ed0..8fe3d7cbe2 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 a68a9dab63..d2379f806a 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 9a4f22f60e..0f943966d0 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 356da2fb1a..3d075d0bb3 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 eaf7993492..27460375f3 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 b310eec2b4..fd8c2c6383 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
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
index 4842ee234b..bb1f1667d4 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
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 11c70c0d33..59f865eff3 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.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/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index e398c5e5e3..a684248fd3 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 fe7780a76b..ea2655c524 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 4a354e269d..ed6ac363f6 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 51083ab19a..694c350b81 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 27d4fb0edd..3e02e51785 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 bf85ac838d..574b11aabb 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 d9c6c8fb32..f28f8a38e0 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 f68b652aa9..633eaab3ea 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 c23f1d942c..309a9e5b3d 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 18982a1d70..47ca8e131e 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 f4e143fa11..c331e1c84d 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 0fde31c95a..381b41026f 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 973ade335b..ec3ff91b6c 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 9346965681..7a574b9dd4 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 a28a5edaa3..0e2d3fb568 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 1120d58cb9..4bc44072db 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 962516f518..e1155c6886 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 cb9afe62c3..1190487bed 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 7444de0757..3e0cdf2430 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 76c6228d30..c83684763f 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 43aba15e51..418b5c3aa4 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 211575acad..75fba9bc2c 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 893336fdb9..91764d9b08 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 a1de152d9a..c37213d04e 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 e69d9482ed..5fe26e43e8 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 c5ad8e283c..3ffe4890f2 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
@@ -556,23 +556,10 @@ void PoolGroup::ReSpawn1Object(PoolObject* /*obj*/) { }
////////////////////////////////////////////////////////////
// Methods of class PoolMgr
-PoolMgr::PoolMgr() : max_pool_id(0) { }
+PoolMgr::PoolMgr() { }
void PoolMgr::Initialize()
{
- QueryResult result = WorldDatabase.Query("SELECT MAX(entry) FROM pool_template");
- if (result)
- {
- Field* fields = result->Fetch();
- max_pool_id = fields[0].GetUInt32();
- }
-
- mPoolTemplate.resize(max_pool_id + 1);
- mPoolCreatureGroups.resize(max_pool_id + 1);
- mPoolGameobjectGroups.resize(max_pool_id + 1);
- mPoolPoolGroups.resize(max_pool_id + 1);
- mPoolQuestGroups.resize(max_pool_id + 1);
-
mQuestSearchMap.clear();
mGameobjectSearchMap.clear();
mCreatureSearchMap.clear();
@@ -645,9 +632,10 @@ void PoolMgr::LoadFromDB()
TC_LOG_ERROR("sql.sql", "`pool_creature` has a non existing creature spawn (GUID: %u) defined for pool id (%u), skipped.", guid, pool_id);
continue;
}
- if (pool_id > max_pool_id)
+ auto it = mPoolTemplate.find(pool_id);
+ if (it == mPoolTemplate.end())
{
- TC_LOG_ERROR("sql.sql", "`pool_creature` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", pool_id);
+ TC_LOG_ERROR("sql.sql", "`pool_creature` pool id (%u) is not in `pool_template`, skipped.", pool_id);
continue;
}
if (chance < 0 || chance > 100)
@@ -711,9 +699,10 @@ void PoolMgr::LoadFromDB()
continue;
}
- if (pool_id > max_pool_id)
+ auto it = mPoolTemplate.find(pool_id);
+ if (it == mPoolTemplate.end())
{
- TC_LOG_ERROR("sql.sql", "`pool_gameobject` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", pool_id);
+ TC_LOG_ERROR("sql.sql", "`pool_gameobject` pool id (%u) is not in `pool_template`, skipped.", pool_id);
continue;
}
@@ -763,15 +752,21 @@ void PoolMgr::LoadFromDB()
uint32 mother_pool_id = fields[1].GetUInt32();
float chance = fields[2].GetFloat();
- if (mother_pool_id > max_pool_id)
{
- TC_LOG_ERROR("sql.sql", "`pool_pool` mother_pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", mother_pool_id);
- continue;
+ auto it = mPoolTemplate.find(mother_pool_id);
+ if (it == mPoolTemplate.end())
+ {
+ TC_LOG_ERROR("sql.sql", "`pool_pool` mother_pool id (%u) is not in `pool_template`, skipped.", mother_pool_id);
+ continue;
+ }
}
- if (child_pool_id > max_pool_id)
{
- TC_LOG_ERROR("sql.sql", "`pool_pool` included pool_id (%u) is out of range compared to max pool id in `pool_template`, skipped.", child_pool_id);
- continue;
+ auto it = mPoolTemplate.find(child_pool_id);
+ if (it == mPoolTemplate.end())
+ {
+ TC_LOG_ERROR("sql.sql", "`pool_pool` included pool_id (%u) is not in `pool_template`, skipped.", child_pool_id);
+ continue;
+ }
}
if (mother_pool_id == child_pool_id)
{
@@ -796,10 +791,11 @@ void PoolMgr::LoadFromDB()
while (result->NextRow());
// Now check for circular reference
- for (uint32 i=0; i < max_pool_id; ++i)
+ // All pool_ids are in pool_template
+ for (auto const it : mPoolTemplate)
{
std::set checkedPools;
- for (SearchMap::iterator poolItr = mPoolSearchMap.find(i); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second))
+ for (SearchMap::iterator poolItr = mPoolSearchMap.find(it.first); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second))
{
checkedPools.insert(poolItr->first);
if (checkedPools.find(poolItr->second) != checkedPools.end())
@@ -862,9 +858,10 @@ void PoolMgr::LoadFromDB()
continue;
}
- if (pool_id > max_pool_id)
+ auto it = mPoolTemplate.find(pool_id);
+ if (it == mPoolTemplate.end())
{
- TC_LOG_ERROR("sql.sql", "`pool_quest` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", pool_id);
+ TC_LOG_ERROR("sql.sql", "`pool_quest` pool id (%u) is not in `pool_template`, skipped.", pool_id);
continue;
}
@@ -969,10 +966,10 @@ void PoolMgr::SaveQuestsToDB()
for (PoolGroupQuestMap::iterator itr = mPoolQuestGroups.begin(); itr != mPoolQuestGroups.end(); ++itr)
{
- if (itr->isEmpty())
+ if (itr->second.isEmpty())
continue;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_QUEST_POOL_SAVE);
- stmt->setUInt32(0, itr->GetPoolId());
+ stmt->setUInt32(0, itr->second.GetPoolId());
trans->Append(stmt);
}
@@ -994,12 +991,12 @@ void PoolMgr::ChangeDailyQuests()
{
for (PoolGroupQuestMap::iterator itr = mPoolQuestGroups.begin(); itr != mPoolQuestGroups.end(); ++itr)
{
- if (Quest const* quest = sObjectMgr->GetQuestTemplate(itr->GetFirstEqualChancedObjectId()))
+ if (Quest const* quest = sObjectMgr->GetQuestTemplate(itr->second.GetFirstEqualChancedObjectId()))
{
if (quest->IsWeekly())
continue;
- UpdatePool(itr->GetPoolId(), 1); // anything non-zero means don't load from db
+ UpdatePool(itr->second.GetPoolId(), 1); // anything non-zero means don't load from db
}
}
@@ -1010,12 +1007,12 @@ void PoolMgr::ChangeWeeklyQuests()
{
for (PoolGroupQuestMap::iterator itr = mPoolQuestGroups.begin(); itr != mPoolQuestGroups.end(); ++itr)
{
- if (Quest const* quest = sObjectMgr->GetQuestTemplate(itr->GetFirstEqualChancedObjectId()))
+ if (Quest const* quest = sObjectMgr->GetQuestTemplate(itr->second.GetFirstEqualChancedObjectId()))
{
if (quest->IsDaily())
continue;
- UpdatePool(itr->GetPoolId(), 1);
+ UpdatePool(itr->second.GetPoolId(), 1);
}
}
@@ -1027,8 +1024,9 @@ void PoolMgr::ChangeWeeklyQuests()
template<>
void PoolMgr::SpawnPool(uint32 pool_id, uint32 db_guid)
{
- if (!mPoolCreatureGroups[pool_id].isEmpty())
- mPoolCreatureGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
+ auto it = mPoolCreatureGroups.find(pool_id);
+ if (it != mPoolCreatureGroups.end() && !it->second.isEmpty())
+ it->second.SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
}
// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
@@ -1036,8 +1034,9 @@ void PoolMgr::SpawnPool(uint32 pool_id, uint32 db_guid)
template<>
void PoolMgr::SpawnPool(uint32 pool_id, uint32 db_guid)
{
- if (!mPoolGameobjectGroups[pool_id].isEmpty())
- mPoolGameobjectGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
+ auto it = mPoolGameobjectGroups.find(pool_id);
+ if (it != mPoolGameobjectGroups.end() && !it->second.isEmpty())
+ it->second.SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
}
// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
@@ -1045,16 +1044,18 @@ void PoolMgr::SpawnPool(uint32 pool_id, uint32 db_guid)
template<>
void PoolMgr::SpawnPool(uint32 pool_id, uint32 sub_pool_id)
{
- if (!mPoolPoolGroups[pool_id].isEmpty())
- mPoolPoolGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, sub_pool_id);
+ auto it = mPoolPoolGroups.find(pool_id);
+ if (it != mPoolPoolGroups.end() && !it->second.isEmpty())
+ it->second.SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, sub_pool_id);
}
// Call to spawn a pool
template<>
void PoolMgr::SpawnPool(uint32 pool_id, uint32 quest_id)
{
- if (!mPoolQuestGroups[pool_id].isEmpty())
- mPoolQuestGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, quest_id);
+ auto it = mPoolQuestGroups.find(pool_id);
+ if (it != mPoolQuestGroups.end() && !it->second.isEmpty())
+ it->second.SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, quest_id);
}
void PoolMgr::SpawnPool(uint32 pool_id)
@@ -1068,27 +1069,52 @@ void PoolMgr::SpawnPool(uint32 pool_id)
// Call to despawn a pool, all gameobjects/creatures in this pool are removed
void PoolMgr::DespawnPool(uint32 pool_id)
{
- if (!mPoolCreatureGroups[pool_id].isEmpty())
- mPoolCreatureGroups[pool_id].DespawnObject(mSpawnedData);
-
- if (!mPoolGameobjectGroups[pool_id].isEmpty())
- mPoolGameobjectGroups[pool_id].DespawnObject(mSpawnedData);
-
- if (!mPoolPoolGroups[pool_id].isEmpty())
- mPoolPoolGroups[pool_id].DespawnObject(mSpawnedData);
-
- if (!mPoolQuestGroups[pool_id].isEmpty())
- mPoolQuestGroups[pool_id].DespawnObject(mSpawnedData);
+ {
+ auto it = mPoolCreatureGroups.find(pool_id);
+ if (it != mPoolCreatureGroups.end() && !it->second.isEmpty())
+ it->second.DespawnObject(mSpawnedData);
+ }
+ {
+ auto it = mPoolGameobjectGroups.find(pool_id);
+ if (it != mPoolGameobjectGroups.end() && !it->second.isEmpty())
+ it->second.DespawnObject(mSpawnedData);
+ }
+ {
+ auto it = mPoolPoolGroups.find(pool_id);
+ if (it != mPoolPoolGroups.end() && !it->second.isEmpty())
+ it->second.DespawnObject(mSpawnedData);
+ }
+ {
+ auto it = mPoolQuestGroups.find(pool_id);
+ if (it != mPoolQuestGroups.end() && !it->second.isEmpty())
+ it->second.DespawnObject(mSpawnedData);
+ }
}
// Method that check chance integrity of the creatures and gameobjects in this pool
bool PoolMgr::CheckPool(uint32 pool_id) const
{
- return pool_id <= max_pool_id &&
- mPoolGameobjectGroups[pool_id].CheckPool() &&
- mPoolCreatureGroups[pool_id].CheckPool() &&
- mPoolPoolGroups[pool_id].CheckPool() &&
- mPoolQuestGroups[pool_id].CheckPool();
+ {
+ auto it = mPoolGameobjectGroups.find(pool_id);
+ if (it != mPoolGameobjectGroups.end() && !it->second.CheckPool())
+ return false;
+ }
+ {
+ auto it = mPoolCreatureGroups.find(pool_id);
+ if (it != mPoolCreatureGroups.end() && !it->second.CheckPool())
+ return false;
+ }
+ {
+ auto it = mPoolPoolGroups.find(pool_id);
+ if (it != mPoolPoolGroups.end() && !it->second.CheckPool())
+ return false;
+ }
+ {
+ auto it = mPoolQuestGroups.find(pool_id);
+ if (it != mPoolQuestGroups.end() && !it->second.CheckPool())
+ return false;
+ }
+ return true;
}
// Call to update the pool when a gameobject/creature part of pool [pool_id] is ready to respawn
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
index 077fcd7dfa..2de769cb98 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
@@ -139,12 +139,11 @@ class TC_GAME_API PoolMgr
template
void SpawnPool(uint32 pool_id, uint32 db_guid_or_pool_id);
- uint32 max_pool_id;
- typedef std::vector PoolTemplateDataMap;
- typedef std::vector > PoolGroupCreatureMap;
- typedef std::vector > PoolGroupGameObjectMap;
- typedef std::vector > PoolGroupPoolMap;
- typedef std::vector > PoolGroupQuestMap;
+ typedef std::unordered_map PoolTemplateDataMap;
+ typedef std::unordered_map> PoolGroupCreatureMap;
+ typedef std::unordered_map> PoolGroupGameObjectMap;
+ typedef std::unordered_map> PoolGroupPoolMap;
+ typedef std::unordered_map> PoolGroupQuestMap;
typedef std::pair SearchPair;
typedef std::map SearchMap;
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index b16e5fa8ad..bc8549bcb6 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 783ca79e75..7480db7bc4 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 a029201b6a..4eec487662 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 675d1879d8..fc5d42e10f 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 96eb4555a9..d63cc74b92 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 226a2adacc..a725b9bb21 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 18b910420b..d1ece83134 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 3c1629415d..ecddda9271 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 a310d4d6ee..154526e212 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 38480cb259..1182283921 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 6357885f8b..e42a822285 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 b7dee66c9b..92ce932617 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 9bd0902e18..22a0880c29 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 dc4ded6520..76720e870d 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 856649a9be..f2e538075d 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 e608294019..5aefa95f73 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 142979af70..bc558ef2c9 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 b2298c050d..379ed90649 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 94df5dd990..19c8e4dd2a 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 158966c43a..384ea3ee40 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 70aebf71d8..f7b34b5e24 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 17b01eb161..bdac20064f 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 74d6c24b4e..8c16508f5f 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 5c392f2366..ca1737b823 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 e409f8d2ea..da53057b15 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 80b15865fb..e380e5b7e6 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 6ce016c862..d76c267def 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 5b7bbdb299..c38aa3d85d 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 41e2869d87..9f85f6bc47 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 3376ce022b..5cf2a21990 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 d0def0744f..23be86a883 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 5e04b0a696..a75a9e039c 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 4879fb8909..81b867bb7a 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 1195a5270a..f8b23e8ef0 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 2c17d3c753..4c29c996ab 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 faab16c44b..8bc410740e 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 7236faa1ad..534c555116 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 0afb26329f..2db8a5a6c3 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 411b0aaf0f..b655213585 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 15e2201284..d391d6a2d7 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
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
index 035993c1cb..7a900cd3eb 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 4d13dcef4d..cc0759b89b 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
diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
index 32eaf8585e..426bddcd5d 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 1e7257247b..a139c77777 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
@@ -2662,9 +2662,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
diminishLevel = unit->GetDiminishing(diminishGroup);
DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(triggered);
// Increase Diminishing on unit, current informations for actually casts will use values above
- if ((type == DRTYPE_PLAYER &&
- (unit->GetCharmerOrOwnerPlayerOrPlayerItself() || (unit->GetTypeId() == TYPEID_UNIT && unit->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH))) ||
- type == DRTYPE_ALL)
+ if (type == DRTYPE_ALL || (type == DRTYPE_PLAYER && unit->IsAffectedByDiminishingReturns()))
unit->IncrDiminishing(m_spellInfo, triggered);
}
@@ -3259,11 +3257,9 @@ void Spell::_cast(bool skipCheck)
// skip check if done already (for instant cast spells for example)
if (!skipCheck)
{
- uint32 param1 = 0, param2 = 0;
- SpellCastResult castResult = CheckCast(false, ¶m1, ¶m2);
- if (castResult != SPELL_CAST_OK)
+ auto cleanupSpell = [this, modOwner](SpellCastResult res, uint32* p1 = nullptr, uint32* p2 = nullptr)
{
- SendCastResult(castResult, ¶m1, ¶m2);
+ SendCastResult(res, p1, p2);
SendInterrupted(0);
if (modOwner)
@@ -3271,6 +3267,13 @@ void Spell::_cast(bool skipCheck)
finish(false);
SetExecutedCurrently(false);
+ };
+
+ uint32 param1 = 0, param2 = 0;
+ SpellCastResult castResult = CheckCast(false, ¶m1, ¶m2);
+ if (castResult != SPELL_CAST_OK)
+ {
+ cleanupSpell(castResult, ¶m1, ¶m2);
return;
}
@@ -3286,18 +3289,39 @@ void Spell::_cast(bool skipCheck)
{
// Spell will be cast after completing the trade. Silently ignore at this place
my_trade->SetSpell(m_spellInfo->Id, m_CastItem);
- SendCastResult(SPELL_FAILED_DONT_REPORT);
- SendInterrupted(0);
-
- modOwner->SetSpellModTakingSpell(this, false);
-
- finish(false);
- SetExecutedCurrently(false);
+ cleanupSpell(SPELL_FAILED_DONT_REPORT);
return;
}
}
}
}
+
+ // check diminishing returns (again, only after finish cast bar, tested on retail)
+ if (Unit* target = m_targets.GetUnitTarget())
+ {
+ uint8 aura_effmask = 0;
+ for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
+ if (m_spellInfo->Effects[i].IsUnitOwnedAuraEffect())
+ aura_effmask |= 1 << i;
+
+ if (aura_effmask)
+ {
+ bool const triggered = m_triggeredByAuraSpell != nullptr;
+ if (DiminishingGroup diminishGroup = m_spellInfo->GetDiminishingReturnsGroupForSpell(triggered))
+ {
+ DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(triggered);
+ if (type == DRTYPE_ALL || (type == DRTYPE_PLAYER && target->IsAffectedByDiminishingReturns()))
+ {
+ Unit* caster = m_originalCaster ? m_originalCaster : m_caster;
+ if (target->HasStrongerAuraWithDR(m_spellInfo, caster, triggered))
+ {
+ cleanupSpell(SPELL_FAILED_AURA_BOUNCED);
+ return;
+ }
+ }
+ }
+ }
+ }
}
// if the spell allows the creature to turn while casting, then adjust server-side orientation to face the target now
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index b03b676131..dfe12af5a0 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 337d6cb2a8..e43da4160f 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
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index f393bf7402..10362cd764 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 c93d3e67e6..35d756fc0a 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 64731c06e3..c45bda78a3 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 2ee08a927b..58bb9979bc 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 a7658a6e16..05442fe862 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)
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index f39dc33a25..b870cf5638 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 d489209df3..5c81eb0bce 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 4a36babe34..acd070e11a 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 d8a17c334f..4921c2f4e4 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 0b371fdf1e..d4333005c2 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 c913e17789..71c403332f 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 cafea34fcc..6178da676f 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 3f20d6185e..85a0b89510 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 ddeebf378d..cf0ff43159 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 5aab1f4ed9..b807f00ac8 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 8884d4612b..466a4ac186 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 c1060d53e0..b6968085db 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 1cc9fd1c50..50d47b9b6e 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 5d486a9632..b2282bf33e 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 9e55780dd0..7027d4345d 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 e6db1e54c8..37c3a2b49c 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 c5abc76da5..af05314e4d 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 f6ada756ec..d694c6dbaa 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 6621eb33df..ec3f9283eb 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 5dba7ad306..70d7bb333a 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 fae8198e09..1da01289d2 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 8f851181f0..20b4034aac 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 3a85a2f977..794dd5cc08 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 4aac649cfa..5a90d3f82c 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 12391db498..22ecb1b643 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 68f9077a5a..ef427476c5 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 8f19559499..5bd5fa2ccb 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 1b6dbe0801..6fd723aa37 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 c3a5d33088..d80f9b4b76 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 abb05aa20f..7bc039fb6e 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 a2677a30fe..70f95f625b 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 e00f190b0d..08c246ac19 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 7d1855c3b3..baffbf25bd 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
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 9d6eaf9112..325a52e12a 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
diff --git a/src/server/ipc/CMakeLists.txt b/src/server/ipc/CMakeLists.txt
index f66a4953ad..df996cb8bd 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 ff733e10db..712846abc1 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 9e0888132f..42e8a9a855 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 f1a4ea5cc8..746b85fd65 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 ba6e108766..912c5248a1 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 d60a59799f..b0c71eb04c 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 4349f1c2e4..be159d2e9d 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 9e752e4481..a3a512d1ba 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 19d120124f..ffead69395 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 fbf266610c..0676f753e8 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 02e49735c8..7ac201e10a 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 26c26f079e..9685c7bd1c 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 47ee8e887f..d1ec387433 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 bdea306cbc..1197a13b35 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 cf35ccda56..70ac16d9dc 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 ddfd35e17e..47e6c0a744 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 08fa562cdb..33a218fc40 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 bfcb82d3eb..813f7cd67f 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 5ace6d3ed1..671f07af84 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 df9b80109a..b0e39c7239 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 6c4097a79b..90e21792f8 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 7806c1e42c..1f38d8c00f 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 9b6830231b..aea4d48a81 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 da0afbc349..19522709fc 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 856d3e18e7..c454957e1f 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 d1778d1499..e069e7a5f3 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 9fa7069d57..f1b5fcde60 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 6f68e8909b..f5b6eeb157 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 c47be96962..1aeedff799 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 abac0e5738..8224b83a33 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 52f661da59..aa3d71eacc 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 b6b281f84b..e65e21728c 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 0e5d4af41b..2c7e6f6638 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 4cff715fd2..23435e8874 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 ff1a1c4da8..da577d4aff 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 94800e3de9..ced838678a 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 56836ebf1e..a58e085c15 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 df4ae7ab6a..934c7a0e91 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 b23d38e64b..0a9c00367f 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 ca7fdd2ade..ec893c5268 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 4d649067f0..a105bee1f9 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 eacce7560f..5babfe8248 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 beba216abe..d7a8f3e2ca 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 64baa0a551..febfea8855 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 96550dce62..d893ce6338 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 6d944c7571..e75610f8d4 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 eb646d8bcd..1da04269d4 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 e32149a686..b9dc39ed33 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 1b4cec7c27..76cbade797 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 5f34d6178f..55dbb6040a 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 0289b713c6..2f4565111f 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 96067b7b18..037f5f87f7 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 b880b1130c..be818f6ff4 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 1e8baefdd4..ec372bc2ea 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 c49c9421f3..495f548ce1 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 ab39d436de..4327ac4c52 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 b74145a18c..87e53ae554 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 f0edc7af0c..a17ba9bc37 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 9b18098417..5c1718c121 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 4a74f9ad72..6dccb51dce 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 82ddfd4c07..3f12ff07c5 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 f1cbd631d1..f612a2b7f2 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 ef409622c3..99a54e3968 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 4d08037d9b..d9376959e9 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 698e80cce0..c8e800b3da 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 55f3cf92b6..0ee1f21fc9 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 a34ebc657e..95b09b1246 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 43d0575e50..2088ece999 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 38d442a022..bacce4b721 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 3575bc7448..4e441b9900 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 7a3d47e03a..6fbac75014 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 f7451d3856..1d8189dd0e 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 73b8c2f2b3..c48f699c75 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 0250e6fac2..9f39937ee4 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 42a15cbcd6..7f3d28823f 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 0e685770ce..fbf46c7d33 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 9944300d7f..02fe43a9a4 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 41beda843e..0fea151f9d 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 37b7e892ae..d08404f2fa 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 b3b3a0f2b4..d144eaaedc 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 c17de75a6c..f6985eaef6 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 691df9b587..177c44801b 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 fe43243881..af8e1fe96c 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 b1cc51e37a..59d0924343 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 f86b36f3ec..dc3f59e89b 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 1bc8d78b79..04ae339e36 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 8251d96dc5..b78b6f2cbb 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 56f5580daa..4b22d9e041 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 5e76a4e020..5c54180d56 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 34eae895ba..e81b17ea29 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 7626afd3ff..ad8282b91f 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 a8766ac625..40d53887ba 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 17ae664c81..1764b6f9dc 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 aaf86640eb..3abd40a4f3 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 1868924923..fdcd20cb8f 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 9dcaf290cb..537d77673c 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 aff9775b79..801caa36a9 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 1e99e07f9e..ca4262b3b5 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 79d556fc51..664d30a1c7 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 5cd6e60a18..33d4418cd8 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 0b4e238a8b..766de94cad 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 b1db789dcb..81a8bc0d73 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 bf6197110f..3e0c246a23 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 79f47eeb41..c8deabbf98 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 2973622d84..e684eab886 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 7198bd276e..7670184c5e 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 44332ac766..e4db85c21f 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 958ff2ef3f..32b829ad8f 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 9161c6bb4c..87fa92b7c0 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 4f5074d470..549aaf7d17 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 cbedc69d00..35ae604dba 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 784cf55430..8c2163b61e 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 05054bcacb..4496e017f8 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 7f473c00f5..1d33b3d315 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 64e59f480b..000c91bc8e 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 b55c939bfe..f4bdbf13ec 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 1fa97bdecd..5f1282b182 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 190aa91aa6..cb5bd8735f 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 6ed123d465..3bdcf9fc29 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 d0028bdd65..09a6914701 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 481472f854..4cb0da232d 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 1ea9a06958..1740cf2c54 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 6f1cfa9411..7395118da6 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 47797d0933..93eca4da25 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 45037170b7..c7bd9d1928 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 b9d3a96f33..896c48be76 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 569e871cf7..057d572ba3 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 33abf4b8ee..a55645a018 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 b7d8f6c4df..6f11785aba 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 67f93f234e..d9e9890d0c 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 18bdc09d2d..1bafd880b6 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 4cf4fcd0a1..82e1d2af29 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 9a8ec45123..c2e01b9419 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 3c4025084d..3b54edf9e1 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 2adb2d445e..92d570cf3a 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 d111172bdb..9c77230e48 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 1adbbec120..b9f2959f03 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 d026182fcb..45e14a60f3 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 7926f2ab05..30f5e6d011 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 3fc3dd1c8f..e4a98b5c0a 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 d3a580f515..bc9d8576cf 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 d174377136..d1ae4a5f0e 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 2b9562b0d6..b82ef9ef25 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 6e0dd3b1ee..b75698ec55 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 cc678f8b53..86a7f5a548 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 c36b99e6e4..f799840c31 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 d558d007b3..c50e8fdccc 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 ca816e8f51..1756dcc938 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 fdf43e5dc1..70ed742aec 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 421c5ac45a..6ff76c94e8 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 d145944bf3..bdf0c5f1f8 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 588086b122..fa78c2a7ff 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 cfdee423ef..d6f35e0951 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 67330fe964..72f5962456 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 c2779bcdf4..7e51397a1c 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 1bcda1676c..2f8ed573d2 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 f1904a50e0..bed8c4b25c 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 cad5668aec..6267199633 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 8816caacaa..6d07ed32e9 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 5b0d888c92..7afbcb78ec 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 4d377bc075..960dd836a6 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 7d3f0dd941..7d3f0600b6 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 12e2874725..3c1763fee9 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 3ec1664ee7..fe02c765e2 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 dd2443c12d..0d51eb0c11 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 cea8aa3b60..5ff1100798 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 8d901572e2..ef292a811c 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 cd07bedc62..6fa715f390 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 fede79df5d..b335f400c4 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 338aa2f62d..dc54d93953 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 e1b491e745..b3eb0a63e2 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 03a2bf0f29..f8157d5a98 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 730700cc90..1619033698 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 e7a3bf99b4..e69a8c98a7 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 a55ecfe6a8..f91612b050 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 51228f1a19..4207781273 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 121d6b51b4..28f37fbbc0 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 82feeaf5dd..0ad2ac0e18 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 c162de33a3..0a4b2cbe50 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 77244dc7a9..428116953e 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 d2e54bf433..a9cbb6aa66 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 d24648b6d8..b201b69f21 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 c6c3c6c4d1..8487d005b5 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 abe6a7b415..843dbfea3d 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 1fb34e5f84..a840dfef4e 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/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
index ed04f83ad4..816c56738e 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
@@ -90,9 +90,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/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
index 1173f6e4b6..770a1403ca 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
@@ -103,10 +103,10 @@ public:
_worgenCounter = 0;
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
if (IsHeroic())
events.ScheduleEvent(EVENT_CURSED_VEIL, Seconds(6));
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
index 0f4b9c9d37..22ce6937a9 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
@@ -126,10 +126,10 @@ public:
*/
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_MALEFIC_STRIKE, Seconds(5));
events.ScheduleEvent(EVENT_DESECRATION, Seconds(9) + Milliseconds(500));
@@ -290,7 +290,7 @@ public:
{
npc_wailing_guardsmanAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (Creature* tormentedOfficer = me->FindNearestCreature(NPC_TORMENTED_OFFICER, 20.0f))
tormentedOfficer->AI()->AttackStart(who);
@@ -344,7 +344,7 @@ public:
{
npc_tormented_officerAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { }
- void EnterCombat(Unit* who) override
+ void JustEngagedWith(Unit* who) override
{
if (Creature* wailingGuardsman = me->FindNearestCreature(NPC_WAILING_GUARDSMAN, 20.0f))
wailingGuardsman->AI()->AttackStart(who);
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
index c0a6aed5a9..e44f8bf09d 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
@@ -87,14 +87,14 @@ public:
MakeInterruptable(false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
Talk(SAY_AGGRO_ALLIANCE);
else
Talk(SAY_AGGRO_HORDE);
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_CURSED_BULLETS, Seconds(10) + Milliseconds(800));
events.ScheduleEvent(EVENT_MORTAL_WOUND, Seconds(3) + Milliseconds(500));
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
index e25053f16b..4ca08df874 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
@@ -67,10 +67,10 @@ public:
{
boss_lord_waldenAI(Creature* creature) : BossAI(creature, DATA_LORD_WALDEN) { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
events.ScheduleEvent(EVENT_ICE_SHARDS, Seconds(23));
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 83d31baa35..263c87f0d5 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
*
* This program is free software; you can 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/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 4b47e3e587..3336fda6c8 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
*
* This program is free software; you can 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/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index 12ad964ae8..748974b612 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
*
* This program is free software; you can 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/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index ed8b2cfc85..1aff5f8cfc 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 f44a914121..4d79773863 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 23111e1d0f..e1bcc623fb 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 7fcb5e0ec0..b5486b3666 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 389aa1b497..82eb0d7da6 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 768c414a01..4ee45c2026 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 c38ba7aad1..2ed56f52ff 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 f1052bc16d..1103f0da89 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 23b2e55c92..3822244113 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 51725964ac..9ced8a8777 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 6508c527cc..ebac2b87c0 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 91594c7b1c..e9b2a8d598 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
@@ -25,10 +25,16 @@ EndScriptData */
#include "ScriptMgr.h"
#include "AreaBoundary.h"
-#include "ScriptedCreature.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "EventMap.h"
+#include "GameObject.h"
#include "InstanceScript.h"
-#include "stratholme.h"
+#include "Log.h"
+#include "Map.h"
+#include "MotionMaster.h"
#include "Player.h"
+#include "stratholme.h"
enum InstanceEvents
{
@@ -36,6 +42,11 @@ enum InstanceEvents
EVENT_SLAUGHTER_SQUARE = 2
};
+enum StratholmeMisc
+{
+ SAY_YSIDA_SAVED = 0
+};
+
Position const timmyTheCruelSpawnPosition = { 3625.358f, -3188.108f, 130.3985f, 4.834562f };
EllipseBoundary const beforeScarletGate(Position(3671.158f, -3181.79f), 60.0f, 40.0f);
@@ -76,8 +87,10 @@ class instance_stratholme : public InstanceMapScript
ObjectGuid portGauntletGUID;
ObjectGuid portSlaugtherGUID;
ObjectGuid portElderGUID;
+ ObjectGuid ysidaCageGUID;
ObjectGuid baronGUID;
+ ObjectGuid ysidaGUID;
ObjectGuid ysidaTriggerGUID;
GuidSet crystalsGUID;
GuidSet abomnationGUID;
@@ -156,6 +169,10 @@ class instance_stratholme : public InstanceMapScript
case NPC_ABOM_VENOM:
abomnationGUID.insert(creature->GetGUID());
break;
+ case NPC_YSIDA:
+ ysidaGUID = creature->GetGUID();
+ creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+ break;
}
}
@@ -223,6 +240,9 @@ class instance_stratholme : public InstanceMapScript
case GO_PORT_ELDERS:
portElderGUID = go->GetGUID();
break;
+ case GO_YSIDA_CAGE:
+ ysidaCageGUID = go->GetGUID();
+ break;
}
}
@@ -242,14 +262,41 @@ class instance_stratholme : public InstanceMapScript
break;
case FAIL:
DoRemoveAurasDueToSpellOnPlayers(SPELL_BARON_ULTIMATUM);
+ if (Creature* ysida = instance->GetCreature(ysidaGUID))
+ ysida->CastSpell(ysida, SPELL_PERM_FEIGN_DEATH, true);
EncounterState[0] = data;
break;
case DONE:
EncounterState[0] = data;
- if (Creature* ysidaTrigger = instance->GetCreature(ysidaTriggerGUID))
+
+ if (Creature* ysida = instance->GetCreature(ysidaGUID))
{
- Position ysidaPos = ysidaTrigger->GetPosition();
- ysidaTrigger->SummonCreature(NPC_YSIDA, ysidaPos, TEMPSUMMON_TIMED_DESPAWN, 1800000);
+ if (GameObject* cage = instance->GetGameObject(ysidaCageGUID))
+ cage->UseDoorOrButton();
+
+ float x, y, z;
+ //! This spell handles the Dead man's plea quest completion
+ ysida->CastSpell(nullptr, SPELL_YSIDA_SAVED, true);
+ ysida->SetWalk(true);
+ ysida->AI()->Talk(SAY_YSIDA_SAVED);
+ ysida->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+ ysida->GetClosePoint(x, y, z, ysida->GetObjectScale() / 3, 4.0f);
+ ysida->GetMotionMaster()->MovePoint(1, x, y, z);
+
+ Map::PlayerList const& players = instance->GetPlayers();
+
+ for (auto const& i : players)
+ {
+ if (Player* player = i.GetSource())
+ {
+ if (player->IsGameMaster())
+ continue;
+
+ //! im not quite sure what this one is supposed to do
+ //! this is server-side spell
+ player->CastSpell(ysida, SPELL_YSIDA_CREDIT_EFFECT, true);
+ }
+ }
}
events.CancelEvent(EVENT_BARON_RUN);
break;
@@ -332,19 +379,9 @@ class instance_stratholme : public InstanceMapScript
{
HandleGameObject(portGauntletGUID, true);
if (GetData(TYPE_BARON_RUN) == IN_PROGRESS)
- {
DoRemoveAurasDueToSpellOnPlayers(SPELL_BARON_ULTIMATUM);
- Map::PlayerList const& players = instance->GetPlayers();
- if (!players.isEmpty())
- for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
- if (Player* player = itr->GetSource())
- if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE)
- {
- player->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA);
- player->KilledMonsterCredit(NPC_YSIDA);
- }
- SetData(TYPE_BARON_RUN, DONE);
- }
+
+ SetData(TYPE_BARON_RUN, DONE);
}
EncounterState[5] = data;
break;
@@ -438,6 +475,8 @@ class instance_stratholme : public InstanceMapScript
return baronGUID;
case DATA_YSIDA_TRIGGER:
return ysidaTriggerGUID;
+ case NPC_YSIDA:
+ return ysidaGUID;
}
return ObjectGuid::Empty;
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 2275956daa..ea5b5cb675 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
@@ -31,12 +31,17 @@ npc_spectral_ghostly_citizen
EndContentData */
#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "stratholme.h"
-#include "Group.h"
-#include "Player.h"
-#include "SpellInfo.h"
+#include "GameObject.h"
#include "GameObjectAI.h"
+#include "Group.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "SpellScript.h"
+#include "stratholme.h"
/*######
## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist)
@@ -142,7 +147,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* caster, const SpellInfo* spell) override
{
@@ -233,7 +238,7 @@ public:
Initialize();
}
- void EnterCombat(Unit* /*who*/) override { }
+ void JustEngagedWith(Unit* /*who*/) override { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
@@ -297,9 +302,43 @@ public:
};
+class spell_ysida_saved_credit : public SpellScript
+{
+ PrepareSpellScript(spell_ysida_saved_credit);
+
+ bool Validate(SpellInfo const* /*spell*/) override
+ {
+ return ValidateSpellInfo({ SPELL_YSIDA_SAVED });
+ }
+
+ void FilterTargets(std::list& targets)
+ {
+ targets.remove_if([](WorldObject* obj)
+ {
+ return obj->GetTypeId() != TYPEID_PLAYER;
+ });
+ }
+
+ void HandleScript(SpellEffIndex /*effIndex*/)
+ {
+ if (Player* player = GetHitUnit()->ToPlayer())
+ {
+ player->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA);
+ player->KilledMonsterCredit(NPC_YSIDA);
+ }
+ }
+
+ void Register() override
+ {
+ OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ysida_saved_credit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
+ OnEffectHitTarget += SpellEffectFn(spell_ysida_saved_credit::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+ }
+};
+
void AddSC_stratholme()
{
new go_gauntlet_gate();
new npc_restless_soul();
new npc_spectral_ghostly_citizen();
+ RegisterSpellScript(spell_ysida_saved_credit);
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
index ff4d330748..7e66f5f524 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
@@ -76,7 +76,8 @@ enum STRGameobjectIds
GO_ZIGGURAT5 = 175796, // baron
GO_PORT_GAUNTLET = 175374, // port from gauntlet to slaugther
GO_PORT_SLAUGTHER = 175373, // port at slaugther
- GO_PORT_ELDERS = 175377 // port at elders square
+ GO_PORT_ELDERS = 175377, // port at elders square
+ GO_YSIDA_CAGE = 181071
};
enum STRQuestIds
@@ -86,7 +87,10 @@ enum STRQuestIds
enum STRSpellIds
{
- SPELL_BARON_ULTIMATUM = 27861
+ SPELL_BARON_ULTIMATUM = 27861,
+ SPELL_PERM_FEIGN_DEATH = 29266,
+ SPELL_YSIDA_SAVED = 31912,
+ SPELL_YSIDA_CREDIT_EFFECT = 31913
};
enum STRMisc
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
index 396d3f0c00..eb84492cd4 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 466270d618..664b483aaf 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 c5b994c084..02090247a0 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 bde2a22039..6bd77a8101 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 9691dcd219..fb3815f8eb 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 6eaecffa2b..2d93bd45a1 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 70cdfa85c1..93e19ea87b 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 0d52fcbe25..1cebe7c96d 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 ebe7fb2d8a..e2543484e0 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
@@ -122,7 +122,7 @@ class VoidSpawnSummon : public BasicEvent
bool Execute(uint64 /*time*/, uint32 /*diff*/)
{
- _owner->CastSpell((Unit*)nullptr, SPELL_SUMMON_VOID_SENTINEL, true);
+ _owner->CastSpell(nullptr, SPELL_SUMMON_VOID_SENTINEL, true);
return true;
}
@@ -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);
@@ -590,7 +590,7 @@ class spell_summon_blood_elves_script : SpellScriptLoader
void HandleScript(SpellEffIndex /*effIndex*/)
{
for (uint8 i = 0; i < MAX_SUMMON_BLOOD_ELVES; ++i)
- GetCaster()->CastSpell((Unit*)nullptr, SummonBloodElvesSpells[urand(0,3)], true);
+ GetCaster()->CastSpell(nullptr, SummonBloodElvesSpells[urand(0,3)], true);
}
void Register() override
@@ -625,7 +625,7 @@ class spell_muru_darkness : SpellScriptLoader
void HandleAfterCast()
{
for (uint8 i = 0; i < MAX_SUMMON_DARK_FIEND; ++i)
- GetCaster()->CastSpell((Unit*)nullptr, SummonDarkFiendSpells[i], true);
+ GetCaster()->CastSpell(nullptr, SummonDarkFiendSpells[i], true);
}
void Register() override
@@ -687,7 +687,7 @@ class spell_transform_visual_missile_periodic : public SpellScriptLoader
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
- GetTarget()->CastSpell((Unit*)nullptr, RAND(TRANSFORM_VISUAL_MISSILE_1, TRANSFORM_VISUAL_MISSILE_2), true);
+ GetTarget()->CastSpell(nullptr, RAND(TRANSFORM_VISUAL_MISSILE_1, TRANSFORM_VISUAL_MISSILE_2), true);
}
void Register() override
@@ -713,7 +713,7 @@ class spell_summon_blood_elves_periodic : public SpellScriptLoader
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
- GetTarget()->CastSpell((Unit*)nullptr, SPELL_SUMMON_BLOOD_ELVES_SCRIPT, true);
+ GetTarget()->CastSpell(nullptr, SPELL_SUMMON_BLOOD_ELVES_SCRIPT, true);
}
void Register() override
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 1976aab174..89a34b1608 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 f38d31ef02..2bee54da43 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 eb99ba3eba..886bc196fb 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 8f4fb2c51a..d9a3e55c9c 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 3a9e74c714..966019d9fc 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 e0395bd154..c301b60935 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 1d4a09e906..7887341e18 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 4e2e4ea34e..2f21b85b3b 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 ec1208f035..c2602dda1c 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 98b94e09c7..222a161742 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 bd332448f2..48b8fbc30c 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 9f229bafa7..fc9dbba276 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 0578da3589..8e44d51c55 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 849075df14..b29d4eea4c 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 2e655b32d8..1a391de8a1 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 8c519f51df..64b614214f 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 c49bc9e90e..708fdec67c 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 08170c73ee..dab70287d7 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 669af1ffe2..85cb72a3e1 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 96c4ae944f..71de631ee5 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 bd13a10a48..24f56f3132 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 813a809650..fb986e8e12 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 b3e4ce5ec9..64020b71f9 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 fdf42cf692..1d43c4c38c 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 3c7ccd33bf..da99fe84bf 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 3013167360..5b9a805220 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 93f6b3b1f3..ca17b84768 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 8b577bbbe8..ab195ed351 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 4303489ac7..69102a9cbc 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 b8e6a975f6..56b2d18031 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 0721dcaf4c..73021b0572 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 9126663ce8..4522877a17 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 e555226fcd..7a8278a230 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 473add294e..6366fdd6ee 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
diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
index c9d846bd36..a3501d4521 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 2e4fd37554..e2d948fd14 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 a60f9fb9b3..77e5473d2b 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 007c114dea..17060c3007 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 e521a3d1bb..f3e1db7d36 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 3aa14e47c6..4c70966c93 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 5aef66e5d4..5ef3b74c2e 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_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
index 328ac2e18d..181a3b778e 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 e4a90dea99..85e43a11dc 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 60f3a789b2..c679eb3275 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 026b5346ae..caca5fa20f 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 590c7a7acd..87fdf71a01 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 bb1cff818b..2283aaa1c2 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 cdc970369c..720782f7f0 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 ba2fb6c4da..04e1d1b8ad 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 4cbdf3b2e5..3559c120d0 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 225035cae6..9dab028073 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 f97527dcb4..3dfdc6f8f0 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 cc38aed296..49e537d84d 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 4512b0fa28..db7b4c4fca 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 b6b9cacf05..bfe71f4aaa 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 a99f749d94..35b8113e9d 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 98daa49ebb..afcc8f6d38 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 cee400603e..eae2e3b94d 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 a287751e3c..76ee2f76e0 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 68d898fb61..5f176a1f77 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 eca757c617..f12c4caa57 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 c3fdb7b12f..c37e1f59ae 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 d36e7fda28..fcc7e384de 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 7e25fe6b38..53c76fefae 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 51b32c2f20..9a7163e3ae 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 b689159707..5af09c7a00 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 38dbd8b6e7..584118ef81 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 caf7d69009..09ccb12977 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 db09129638..82e652f526 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 b6dbe9e72c..9f2af81516 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 a0744b992f..4a0a96092b 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 66189f9c71..8380700e75 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 7374bb12f2..7633249c2a 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 93fc93f348..97ab07f55b 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 1a7452732f..ab5b114caf 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 1c05b82d06..09f5cac86f 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 e4252ab7e7..8c311af424 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 cb512c02cf..aef2c43b5c 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 9c0388e893..a65e7aa7ba 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 0cd1a7a645..fc3ab0cdae 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 00b6edb7ee..cfdbcf5020 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 e23d81aab6..6b066ab716 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 2625434b09..3ac0c24411 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 d5a7af487a..68ee56c0e4 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 a90769b4a4..b7963c30b4 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 227b89b459..73ac4cfd18 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 52eb8a6c4f..971d3e19c5 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 17b51ddb22..962becd538 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 55482fd37d..a967f15445 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 3ad05a7906..6389449064 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 053b670c25..09c79fd51d 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 6a15068e32..e54b10a592 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 c5274e9c98..8d477aaf47 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 22ee9fb6be..cf2a3e1f77 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 0a596c1591..faa94906e4 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 24d9052bee..927640be07 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 dc91816cae..1681156a8d 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 5cc3ce3d64..dd703a7ca9 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 3cc85062c5..ab3c6fdd4f 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 b749c57202..de73626138 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 04441bf56b..6276f287a9 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 58dc2594d6..8a183c8efa 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 df765995b3..bcb3e72733 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 fa8c2f7739..88a163aace 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 99c1365fd0..b1bb7ed2ed 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 fadcad06a0..7e80546324 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
@@ -132,9 +132,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));
@@ -356,7 +356,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));
@@ -443,7 +443,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 937b30df05..e60b5e2f45 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);
@@ -390,7 +390,7 @@ class npc_lockmaw_frenzied_crocolisk : public CreatureScript
me->DespawnOrUnsummon(Seconds(5));
}
- void IsSummonedBy(Unit* summoner) override
+ void IsSummonedBy(Unit* /*summoner*/) override
{
if (Creature* lockmaw = _instance->GetCreature(DATA_LOCKMAW))
lockmaw->AI()->JustSummoned(me);
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
index 6d9e6ab6d5..6cdfd8787e 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
@@ -126,10 +126,10 @@ class boss_siamat : public CreatureScript
SetCombatMovement(false);
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
- _EnterCombat();
+ _JustEngagedWith();
events.SetPhase(PHASE_1);
events.ScheduleEvent(EVENT_STATIC_SHOCK, 1, 0, PHASE_1);
events.ScheduleEvent(EVENT_DEFLECTING_WINDS, Seconds(6), 0, PHASE_1);
@@ -337,7 +337,7 @@ class npc_siamat_servant_of_siamat : public CreatureScript
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.SetPhase(PHASE_1);
_events.ScheduleEvent(EVENT_THUNDER_CRASH, Seconds(11));
@@ -440,7 +440,7 @@ class npc_siamat_minion_of_siamat : public CreatureScript
_events.ScheduleEvent(EVENT_REMOVE_SCALE_AURA, Seconds(1));
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
_events.SetPhase(PHASE_1);
_events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(3));
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 7eaecf1446..ca7383d5ad 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
@@ -80,7 +80,7 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
void Initialize()
{
- _heroicAughSpawned = false;
+ heroicAughSpawned = false;
}
void OnCreatureCreate(Creature* creature) override
@@ -101,14 +101,14 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
case DATA_LOCKMAW:
if (!instance->IsHeroic() && state == DONE)
SetBossState(DATA_LOCKMAW_AND_AUGH, DONE);
- else if (instance->IsHeroic() && state == DONE && !_heroicAughSpawned)
- _events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(4));
+ else if (instance->IsHeroic() && state == DONE && !heroicAughSpawned)
+ events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(4));
break;
case DATA_AUGH: // Since Augh is summoned, we need to handle his respawn here
if (state == DONE)
SetBossState(DATA_LOCKMAW_AND_AUGH, DONE);
else if (state == FAIL)
- _events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(30));
+ events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(30));
break;
case DATA_GENERAL_HUSAM:
case DATA_LOCKMAW_AND_AUGH:
@@ -192,20 +192,20 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
void Update(uint32 diff) override
{
- _events.Update(diff);
+ events.Update(diff);
- while (uint32 eventId = _events.ExecuteEvent())
+ while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
{
case EVENT_SPAWN_AUGH:
- if (!_heroicAughSpawned)
+ if (!heroicAughSpawned)
{
if (Creature* augh = instance->SummonCreature(BOSS_AUGH, AughSpawnPos))
augh->AI()->DoAction(ACTION_AUGH_INTRO);
- _heroicAughSpawned = true;
+ heroicAughSpawned = true;
}
- else if (_heroicAughSpawned)
+ else if (heroicAughSpawned)
if (Creature* augh = instance->SummonCreature(BOSS_AUGH, AughHomePos))
augh->AI()->DoAction(ACTION_AUGH_ATTACKABLE);
break;
@@ -216,8 +216,8 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
}
protected:
- EventMap _events;
- bool _heroicAughSpawned;
+ EventMap events;
+ bool heroicAughSpawned;
GuidVector addStalkerGUIDs;
};
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 b2dd32c0f3..400c1d9dcb 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 491b05063f..f500c02e47 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 37f7965890..7260e6ca00 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 3651419901..00140dd228 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 e5b9833788..26c5a64b15 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 b3e3552b4d..d1e0704612 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 52a86f5d2f..4f0b6ed852 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 afb7c801a0..0252e241e2 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 ba931c86cc..8a934dedcd 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 c49d6b296e..08a7767384 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 ffb75543d8..3bc1c0125f 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 553375db4f..255e0685ac 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 2f6e469f25..b35528416c 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 2ad263d325..86541a009b 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 5fcc2e15a3..8e3ceda742 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 c7c1033527..c5a201bfc0 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 2501b399d1..a984066388 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 c14383ffaa..c22bbcfa2b 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 64feea5015..8ac070acaa 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 1de42a0bb3..07566ce7ba 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 23247e0ba0..c24d27096b 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 735463744d..846739ee56 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 1e8db0f104..c7fb5836ed 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 9f214eb5e1..2e58dddede 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 569f3a9105..1c02e68fd0 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 5fd456c029..2d19fb7416 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 2c3e23f4dd..8f80c8e535 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 944c2768b9..1c8a9e8c70 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 e229a5ea5a..63656b2d10 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 013a82e78d..93e61ee495 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 011cf1509a..677427cca3 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 45a61cecd4..01d454039b 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 37740d27a5..b87efd49cd 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 006d6377b4..d29782b262 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 26ccc6a9c8..6b73875fc2 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 92bd20a289..325aed87c6 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 1d41e808bc..6a7838a703 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 054844c9c2..8ddf7e7351 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 a4457b7e82..2fbc2a0aba 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 58e75af627..33a3867cb0 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 514fb2a479..c4bbba910e 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 0163085056..2d728fcd40 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 614e748717..974b7a7215 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 03067acbc6..5d84d69457 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 579095cedb..b7ed526c8d 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 8b4e203f40..b4c330ac04 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 4de76e6e09..7234526e8a 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 3782b5d65c..6a348a0161 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 a24c8d99ae..79696d4ef2 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 7033944f90..e1e2cd0ab3 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 22d93673b4..e760598473 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 443158bb59..dc7376a049 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 d92d7838bb..8d2039f4be 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 0dae89e5eb..f78e86e7eb 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 250ea964ff..25ba260c2f 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 3eabc0f4b0..6d08f3bf0d 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 3bae896e0e..ab95e1c8d8 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 cafd9a8c91..e41038a64d 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 176f9da054..d6366be24d 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 cfd6bbf8b6..107d63cfe7 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 09d0a719aa..adc64211b7 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 748442a379..3f9d06d19a 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 739e74e875..ad1aec839b 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 9dfd78f52e..6fa3352245 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 33b7f161e3..6eefac9523 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 172904e6c4..2c0d90da9b 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 2521ceae80..0e51169749 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 acd03e049d..1f400bdd61 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 15fa1a46ff..6ca17c78bc 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 1471253584..157e37dcbf 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 3ed60b943c..70eb58850f 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 f2e45de0c7..d108f8859f 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 bf17d658c6..b8dd6a1788 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 edf1e243dc..50bf7fe4f7 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 b2b3e291dd..907f4148b2 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 5f0ecd6a59..14ab442369 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 32adc79116..29611c23cd 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 c915846da3..0ce55b6184 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 1074a39ea8..cd34681aa3 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 c8624afa96..2207d089a6 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 ae06479e00..0596631e0d 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 d53a3eee7d..5396cd1942 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 27e4cac6d8..814ac6371a 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 d6a95dc101..3b693ca6df 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 970a64e1fd..8443e1a125 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 9f7f97a0ca..4a651769fd 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 242dd354a0..6017ba2c89 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 6998080407..b1423e8aa9 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 8ee342db3a..6c3427956a 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 7e7a7d09b5..19badd46a5 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 be7b4cf489..b30cc5c4b8 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 865b8e423e..8a251b90d3 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 919f008c10..abdb09e156 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 67973d32a3..dcddc1f2e6 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 58f791e9a4..b32dc1d4e4 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 03ba3b4b26..cdeb2730c4 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 88de9ff9d1..893987497c 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 4bdbee94db..67063e471a 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 dc43b7f6a6..fa5359a9fd 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 92331e8c8b..2bf0ca7f8c 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 b448ce1bda..79d40b29f2 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 6a3a185061..4559cf170f 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 46a74d8411..e30194e204 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 96d6401248..3804584a01 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 c9d68808c1..de4a1f16be 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 e9ed41f0fe..df89c790d5 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 3d9c6c8f65..8c97b4a04b 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 663df7faf2..20a22e301b 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 8e4400a285..8523863530 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 ed63747a53..124a39edda 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 d05c2c303a..58ab85d0c7 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 3bb4a121d6..bd8b4f07d9 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 d4be2f90f6..c2b0031ba6 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 5e9d6515db..ccc4714e87 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 9ca1dee21f..3d5fbea4cb 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 30a0138a68..16b0deafa7 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 99a87f981b..d2118ae377 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 598caddd72..a83e26ba74 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 4bf162838d..ac86735c93 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 86b16216d9..a2165ffa60 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 0b672e3c1f..e98bbed7b9 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 58c7f780ad..91cd054664 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 66c44c0101..4f08bd2db9 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 00676a0a3c..680103402e 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 50bf88593c..afed4d3be6 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 de016aed14..bcbcb5cbe5 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 68ba3cb259..a552a150b2 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 a71214b797..f6d65a5718 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);
}
@@ -242,7 +242,7 @@ class npc_corrupted_soul_fragment : public CreatureScript
if (instance->GetGuidData(DATA_BRONJAHM).GetCounter() != id)
return;
- me->CastSpell((Unit*)nullptr, SPELL_CONSUME_SOUL, true);
+ me->CastSpell(nullptr, SPELL_CONSUME_SOUL, true);
me->DespawnOrUnsummon();
}
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 2b5224947b..d6f51d4193 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 ca15dec665..c8c07cb01b 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 897cd72ba5..786e6bc4e1 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 2b6548bccc..e1017b01bf 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 3128014ad5..278645a3d0 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 b56301e8e6..28cfb3a0b7 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 f0ecdc07dc..ac80a42a9d 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 77f7d9d41a..67032e2df6 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 0cd5990beb..2616c2d88a 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 fc1395437c..90e1f04ef7 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 270f4d0c70..07d96e5c27 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 cec1d885e7..06e53a95f5 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 652aed172f..e9f638bff7 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 0e11e7f908..22801f7faf 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 7d79e4a9c4..11ff37700c 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 7af34da74b..bf96ce3603 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 cb44a42450..6f391e17f6 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 9d3dbd4e2d..76e2cb065e 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 22c023983b..4d05f485c5 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 62d215f916..b5162207d2 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 68de4c716c..ec63e1dab3 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 244d5aa918..469aa0d3fd 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
@@ -319,7 +319,7 @@ class instance_gundrak : public InstanceMapScript
if (GameObject* altar = GetGameObject(altarId))
if (Creature* trigger = altar->FindNearestCreature(NPC_ALTAR_TRIGGER, 10.0f))
- trigger->CastSpell((Unit*)nullptr, spellId, true);
+ trigger->CastSpell(nullptr, spellId, true);
// eventId equals statueId
ToggleGameObject(eventId, GO_STATE_READY);
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 abc0d22162..ee9092c97e 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 e070829ea1..e6a842ea34 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 cea762cca3..75bdb59630 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 e92b66f358..8c2922efd1 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 f2fcf44fd8..35b5c3ba23 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));
}
@@ -1845,8 +1845,8 @@ class spell_igb_rocket_pack : public SpellScriptLoader
void HandleRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
SpellInfo const* damageInfo = sSpellMgr->AssertSpellInfo(SPELL_ROCKET_PACK_DAMAGE);
- GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude()), NULL, TRIGGERED_FULL_MASK);
- GetTarget()->CastSpell(NULL, SPELL_ROCKET_BURST, TRIGGERED_FULL_MASK);
+ GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude()), nullptr, TRIGGERED_FULL_MASK);
+ GetTarget()->CastSpell(nullptr, SPELL_ROCKET_BURST, TRIGGERED_FULL_MASK);
}
void Register() override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 765b871794..1c92cbc128 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 d27ec7fb40..66b3cc3a12 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 9599614320..736eb5201c 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 21cb420cc5..66d434b770 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 446f9c4afa..58eb328ddf 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 078b2dd513..3b770c46f5 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 cb9b9eeef7..717e2e2ace 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 067520caf0..113ec50a14 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 94a0a21bc7..ed723bbfe9 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 571de70bc0..aa73f9b95a 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 c674d1bfdf..004ec13e8d 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 78697f3238..ed16b6728a 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 1fabeb878e..4489076824 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 9df479f51c..4a373102b7 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 db1f7975e8..5b3a7d53c8 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 ad304c711c..4e3ec1bd14 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 12c89d119b..4039cbc634 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 9fcb35b269..e6a919fc97 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 914db8461d..87c6051a66 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 5b408dafbf..9da47b40cb 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 d3108155b2..3b2b3a6f50 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 0506d85faa..de9a47d8b5 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 d513a4e158..42f04344e0 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 daf9aba31b..09904dd9bb 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 6c5ba31835..e26edfdce1 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 51eb68b6ee..067d548828 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 d97cc9fa59..74da060751 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 ea86b88523..77d47b892d 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 8eccf5cce6..2d46e7403a 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 64e313fea5..99dc0e54dc 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 5a0177cf03..fc56b5b90f 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 e06b5c1023..c0c8666344 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 509082206e..96e76dc486 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 e8c5da8d76..394f46b160 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 c8c80ed9d1..dd31343137 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 6f02f9abf1..476a98806c 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 26a427dbbe..90b7bdf37c 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 935d309eb0..81a5bb1cb5 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 950ba5d91f..3fba12c3f4 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 dcb1886e81..434aa33b83 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 c4b07c78c3..acaaeae95f 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 90eeafb407..5cdd04f496 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 c5a1a95b2f..b4d76e076c 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 b07c0f2216..ca994d71e5 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 7865ffaec8..292ddd8004 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 647f2ffc71..366f1fddb6 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 9fa184da93..9f9fd33fe9 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 94931e9dae..1eab4132f2 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 65991267f6..025c16af44 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 aadab9f1d2..88ed842d2b 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 3cd470d1a3..96fd48cc4c 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 c0c2998f87..4d98f87c11 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 2cbbd8556b..22df062831 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 0782a552bc..937f2372e1 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 4674984d8c..ae664ceae1 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 692875c496..f29ab70962 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 47fc35d620..e3fae84a7e 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 c9b83d7e01..1e772f9d62 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 69042bf18f..3665ef4447 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 7609a8518c..4e3c66a09c 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 f62f7ec51f..aea63dff76 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 fe6565664f..307e5e4e80 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 392fe54be3..8d965924d7 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 412295a664..8dd67e1ff5 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 bc105a0422..5d1a3fb854 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 00370d8751..4670e062ab 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 59b9cc5bcb..feef62901b 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 7aa60e8af6..664fdec748 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 33e97e8baf..660b52d9b6 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 0a1131e713..ece8443c6d 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 bbdb223a0d..d877752b20 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 0dc4e553ad..cc16588c3b 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 863740fa70..8e078e2419 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 38979ecd66..759553df39 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
@@ -500,7 +500,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 +753,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);
@@ -1596,7 +1596,7 @@ class npc_yogg_saron_keeper : public CreatureScript
}
}
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
switch (me->GetEntry())
{
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index d662578b9d..2280a176d9 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 1596453464..ad8197e5df 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 7eb24fb5dd..b5822a294e 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 7e732e9bc6..373a6d8eaa 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 27da9c2e8b..487f289381 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 ed8f349edd..6097521b0b 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 c5a0000fd8..d175b13ffb 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 81a357e4cf..2fc8b6e894 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 dead19a90a..b2b5364e08 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 1e2da34120..578637611e 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();
}
@@ -857,7 +857,7 @@ class spell_summon_gauntlet_mobs_periodic : public SpellScriptLoader
for (uint8 i = 0; i < 2; ++i)
{
uint32 spellId = SummonSpellsList.front();
- GetTarget()->CastSpell((Unit*)nullptr, spellId, true);
+ GetTarget()->CastSpell(nullptr, spellId, true);
SummonSpellsList.push_back(spellId);
SummonSpellsList.pop_front();
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 7eff09338f..3c4b333019 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 a55ddfa6bd..a4e4f8249c 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 2afe31455c..b92f6ddf10 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 a2d5004c6e..b4731a8765 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 71ee628507..59c9bc7d3d 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 20a86e2c8f..042a473f0e 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 6141c2167d..0ef5645b2c 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 9d80dc64a1..ede24ae8f5 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 a3bac4f39d..16e972a5ef 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 3af77979c6..750e7c4649 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 ebcc48f5ed..99fcf9cfd3 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 1bc7223f08..964ee11d94 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 3ce72ebd74..4450dfe98d 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 1a25a0b69f..9309276f05 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 cc1e96f78b..bfaf7d972b 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 367ab44b46..4d00e558e4 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 f26ca43053..fec6547710 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 a956c11c11..64178c66a3 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 f5e962117e..2affe94ef2 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 537c5d51b1..17ab4da834 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 e3c5fb720a..93e1d1f9d9 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 003f660a8a..56870ec2ba 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;
}
@@ -2369,7 +2369,7 @@ public:
{
if (GetTarget()->isDead())
if (Unit* caster = GetCaster())
- caster->CastSpell(NULL, SPELL_WINDSOUL_CREDT);
+ caster->CastSpell(nullptr, SPELL_WINDSOUL_CREDT);
}
void Register() override
@@ -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 4dadebb1cd..5794eb7f75 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 0e51de2382..eb4a6d7c61 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 93fedc08f4..f771c587e2 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 9eb66ad9f3..a17f52d7bd 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 29a87e32d6..c1848464bd 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 849a3d5568..6cd5d23bfd 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 9bf9cf1017..7a1150af29 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 ab3300c0db..e03d74856d 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 2a1238d5e4..3b0a90be56 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 21983384ab..43f7747ee3 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 e74bb1f0ba..7de320fee4 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 811324abeb..a37e6adaae 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 89b76d8eeb..1de3497d87 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 77b9e755ab..8fa558e81b 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 4086c822c1..3a736f2f02 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 1a8f4ec0d5..b949a79ece 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 250a013e8f..ecbe992ee8 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 6f87e29034..759e496d2c 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 276e190577..37536aee41 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 97ddc96106..9ea5be34d0 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 77301b9632..afb0ce8aea 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 18354890ba..fcca8088ac 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 386d65c31c..b7867fce8b 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 1037fcebcf..5a9e8c9f65 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 9655b20b55..1da7e599be 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 7917d40b8f..1ef2c87433 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 0b0dd61631..ea8bb96d49 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 7f388b198a..9731b8edd1 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 707eb89ef9..1807e4bd32 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 e2bbdd30f9..92ced2c9c1 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 f0bc7a3b53..cceac33777 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 7c04bfead7..14c27fe0be 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 31f874dcb6..28be6c07c1 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 3471b23daa..f904b5b35f 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 976f95cfd9..5cb3370199 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 fa3978840c..8466b374be 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 0d59d301a5..4ceac92e44 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 ac9ef77cd8..e9ac763793 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 0e75d60919..1a720970bb 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 8b830ccad6..2d906c2651 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 48334af4ab..a62755aa03 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 042cff8761..7fa89edb23 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 bf9bc77bf3..b16b38801a 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 7d851ec8bf..dad4878247 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 485ed8ef49..ff8da59fe0 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 5a51653759..da5a92fcff 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 d1993aae98..3c35fd63aa 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 d5f52b2fc7..7dcdc907f1 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 c2131a4669..344097aec1 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 67dfa42b54..093cce5f48 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 6df3a3dd54..9d6c27144c 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 3805b0d1f1..f0b490a1ae 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 6215bc47bb..a4d3c3f923 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 a468f9714a..f6dc16e837 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 0bce78607d..33771cc709 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 815aec6ed2..4e94cd1edb 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 d9c86cbd94..710e4c56f4 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 f7a09e9b57..54eb141475 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 8640213703..9543e4e10e 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 160bf15faa..408b6b422a 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 0fe6a947e0..3d2a4ea45c 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 f7e9dff38b..4885704133 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 bd13ab09a6..390d861730 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 e0aaf89e25..0c3dd765e1 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 08298b15ea..73ad79d47b 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 30f9f34a5d..9d80f1a6a8 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 d169a21f0d..aceee192b4 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 7a9fa30b63..0144d81707 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 36400166f0..dd75e1e4b4 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 cab61b0f7e..91d1edf025 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 77b438a11c..1038604f2a 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 9b22d61f4e..044f68a3aa 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 ca8c64194a..0172340670 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 a21d423862..1940b5b837 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 7da087cc0b..4037386998 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 1406c118ad..cf5c9f53c8 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 a9447f55a3..a3ed0d74ad 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 dd9017d780..86d53002a7 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 2145ebee72..626ba4b842 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 4c05bde00c..ba879cd583 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 f99c85a4c5..ab9ac593bb 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 2c746b0038..b95b94b540 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 7528a98c65..d0c817aafe 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 2e22f6becf..d87f3eb193 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 4f8784b168..773905382a 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 1fe1479c51..bee72bf775 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 4715ba21e8..899ca96454 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 620f4018f6..e7661d488f 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 8d6ac51f81..d899540730 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 1c20e4c41b..d6a6ab3888 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 9d99e28986..2b4f6cd37f 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 c2deaf331b..fe93061e85 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 2bf0b1870f..b97b15a66d 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 68ac53eb70..476e0ed9b4 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 a4f10aa9ed..fda0124c36 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 156100f131..ded1675295 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 3dad650b78..5f95314e9f 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 d62746e098..886dfea62a 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 e80845549d..eb286ca4f9 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 134f0b37ba..14fd77a8c3 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 28ff78217f..da4402ec5b 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 36f6afd00f..5d37fff4cc 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 8e757f85dc..28e6c4c187 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 a7fdef9d99..6b85c6376a 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 1111e2409f..fc3024c340 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 b10b627633..06da0fc493 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 e73459d3d2..57607d0a22 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 1903655578..415e9a54a6 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 199fa3d81c..4ecca88d93 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 239d6522fe..3c5b6dad9e 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 47587cf528..4c9e17ae4a 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 35494c745f..482f4c9874 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 6c469601ef..b246a23a7a 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
@@ -324,11 +324,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 +544,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 038dfb1606..2effe40b86 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
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 52481ac629..0cd2dd6ef1 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 fec78e29e9..fbea284b7b 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
@@ -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
{
@@ -288,7 +288,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, 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 4f12a669a6..3371cc4775 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 54693d3776..d28b595553 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 91d7def906..e1a6c8c7a2 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
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 ad83bd90e6..4719a4e07b 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 7709251a87..d5efd734f0 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 7f1d74986e..fb86404b5e 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 6480b8a2b5..8474654e2e 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 31f1c0ddbf..f02cb80d24 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 3d878bae81..11e2df1b59 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 fc773d0b13..811c432087 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 4d8ca8ff2b..f2bd2d6894 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 68dae506fa..863d48c887 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 65488a81bf..6f421c6284 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 42d5a806e9..b9455e8130 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 55d28f3d6a..0ab7d46a73 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
@@ -262,7 +262,7 @@ public:
void Reset() override { }
- void EnterCombat(Unit* /*who*/) override
+ void JustEngagedWith(Unit* /*who*/) override
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
Talk(SAY_ELF_AGGRO);
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index d63081c71b..71a8193884 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 fd7c47b5c5..631871fc2e 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 0acc455a62..fb89bf4019 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 4c1fdc2f6b..15a4648020 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 9b4c738c78..79a0f92d3b 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 e4d352f922..7a918198b8 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 a17b9fd8b5..dacca30c51 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 3f08f8273a..d9e12fba56 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 89bb8a7630..7e19315ec5 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 fa2e65f710..1616e8e229 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 09dc6c0743..c344523988 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 1edae76fde..f6fed72205 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 0a578d8bd2..cca10c674b 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 39e68abb88..bd96b32f70 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 7ec1106ab2..532c8f08e7 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 3f2c3430e4..68a806c377 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 35fd1e6b94..f5fc547bc5 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 b5df37b753..e00681f3e9 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 fe94fb7e8f..e5e44543ab 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 489134f5d4..6872c00b39 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 8cf817b3aa..90e658690c 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 00b64366d5..e0fc96e487 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 b5401b2b31..5b6ac5955a 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
@@ -4692,6 +4708,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");
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index ff802462c7..57af21af00 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 56b391db90..5914059b60 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 a94c129a51..a7b515fd79 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 2408abe20d..d8f6ad4314 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 dfddb39a29..0ab36a89f6 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 e9453b4873..25edcf0ecc 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 ce1664b281..5a86fdf23f 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 7325201674..582ddad0c0 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 6de09b0a63..80715de783 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 30950f7691..226906c426 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 9495970378..98414ee89a 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 03ff4cae77..85cae1216c 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 cc3983d7e7..2708a59d52 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 c674a32f43..d80435ece5 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 9b3465174a..972791e8a2 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 a29924cc45..00ff46aba8 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 78f2c46899..5f4635717c 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 a5d3ce8d50..1dbb55831d 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 56253d6ffc..b1e1986e44 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 a7370fde1b..3bb43efcac 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 3755217f15..5bd5e31007 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 c359c8d027..7f28bb0a37 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
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index c632eca016..8ef373bbd7 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 086bd8700f..3e9fcf9f87 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 a016a6bc50..ffa0bee4ad 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 dec839b0c1..dacb14674c 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 59cea1ac73..2895fc2c3f 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 5ee36216ed..b1dc322e94 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 f9461f4654..1a3d33677a 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 f93eafb559..708a34156b 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 e71b2b805e..48714fa766 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 b54fd32a8c..2a3742863c 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 070bdc149f..8bd0a10c55 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 0d64c337cb..2973a103d6 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 0dbf1ebf2a..432e67665f 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 c0c4ec21a8..9f9805d71f 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 5f614819b1..394147e992 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 d36c90e251..bea05adf59 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 99c1f01030..f8481c1bd0 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 44fa0fe927..61dea07397 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 5413a88c8b..d9e5c01a0d 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 0c9e71be97..4251a0868b 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 ad176a9ae2..0cd01af7ee 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
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index 351c7f1d26..f78b20f715 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 594304d4c1..e0ae87d908 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 4f5eeb82a0..99a5df18b0 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 bc31f14406..da10cb9199 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 60d0896464..7c1fe1fcb6 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 ecc8cd47c5..2605474ac5 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 a69a30b3d6..1f8f021b19 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 3fbb677d9b..d55be284d6 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 94ab5e480f..a0f1ee8f8a 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 d5e03edbd0..4e6f52616c 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 427478e522..4d1605fb07 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 45473f9ad8..fa4ab6a463 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 6c75fe0807..09a1d1a862 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 3cd5189ef2..aa77fd0842 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 86d1c861f4..d39d26ec8b 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 e342c15496..c3aade6f7d 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.rc b/src/server/worldserver/worldserver.rc
index 86e1850eb0..56fcf6b34f 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 7cf20edc15..2bbaa3e24d 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 58e6dc0a2b..abee2a2248 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 b744d2cc4e..ba5a4a1e63 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 bf0def4e6a..f8f72dc416 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 1e0137ef41..68b84f7352 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 f8f5a81175..0c584e7d05 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 b3b993644c..6b06ff7911 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 3cd8f236da..74051d402d 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 2e02c609d3..0a8ef2f8de 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 8e65101e2d..1da5954c0f 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 948b863e26..ec1186cee0 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 4a788d2bd2..2709b43e22 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 6a802ff105..397702a498 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 edcf372e37..44f5669b9d 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 0f32fd7b45..5e6b12d71a 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 19715cbdea..4064614175 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 1ddb5a8009..4f553302c0 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 bd56a2ee6a..0013b5e13f 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 5be7687faa..a703382c8a 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 f5f282d1d3..979753131e 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 47615b937b..14066daf90 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 c1615c28d0..9a4cbe95b2 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 e565855e7b..83ac9f5c55 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 c7b3770006..d6a0a642bc 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 8062bbeef5..6567254108 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 fc24d993a2..7e37511e53 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 fbe8300cfe..9a56bed30b 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 0fefec0904..1af3e51a45 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 357c206d00..204bca77ca 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 5569093bc5..fea5cb3f7a 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 cf093e5934..78f1db50c8 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 dd89bc1afb..0fa5f328e5 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 316d1c0fb1..33630d635b 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 461d27f8b7..a73d259d52 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 58704e65d1..8948489a90 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 13f7531cd3..49f10cf306 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 b6b9a1854e..2b0bee9417 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 ee8e15dc56..a5c4e71d93 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