Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.cpp
#	src/server/game/World/World.h
#	src/server/scripts/Commands/cs_server.cpp

src/server/shared/DataStores/DBCStorageIterator.h

@@ -22,9 +22,15 @@
 #include <iterator>
 
 template <class T>
-class DBCStorageIterator : public std::iterator<std::forward_iterator_tag, T>
+class DBCStorageIterator
 {
 public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = T;
+    using difference_type = std::ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+
     DBCStorageIterator() : _index(nullptr) { }
     DBCStorageIterator(T** index, uint32 size, uint32 pos = 0) : _index(index), _pos(pos), _end(size)
     {

src/server/shared/SharedDefines.h

@@ -3282,6 +3282,11 @@ enum SummonType
 enum EventId
 {
     EVENT_CHARGE            = 1003,
+
+    /// Special charge event which is used for charge spells that have explicit targets
+    /// and had a path already generated - using it in PointMovementGenerator will not
+    /// create a new spline and launch it
+    EVENT_CHARGE_PREPATH    = 1005,
 };
 
 enum ResponseCodes