diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-12 19:36:48 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-12 19:36:48 +0100 |
| commit | 506ddbbf40d588840cd8eee810761b6a5ed44973 (patch) | |
| tree | 22a45c3f396a38b6f37aea4e6f27c7d4b103ac71 /src/server/game/Movement/MotionMaster.cpp | |
| parent | bb62a9180d2645d318416fc719f0ff0aef1ed013 (diff) | |
| parent | 3cee0b7dc78055c8b582133b1c2f8b8a23703a16 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index e4694dae91c..6b45d5cf09c 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -72,7 +72,8 @@ MotionMaster::~MotionMaster() { MovementGenerator *curr = top(); pop(); - if (curr) DirectDelete(curr); + if (curr && !isStatic(curr)) + delete curr; // Skip finalizing on delete, it might launch new movement } } |