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
2022-05-02 16:39:21 -06:00
parent 92841a35e1 0ffa270c94
commit 0326d8576d
99 changed files with 839 additions and 5304 deletions
@@ -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