Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Spells/SpellInfo.h src/server/game/World/World.cpp
This commit is contained in:
commit
f7aedaef33
56 files changed
+455
-117
No files matched your search
@@ -130,6 +130,9 @@ void MotionMaster::DirectClean(bool reset)
|
||||
if (curr) DirectDelete(curr);
|
||||
}
|
||||
|
||||
if (empty())
|
||||
return;
|
||||
|
||||
if (needInitTop())
|
||||
InitTop();
|
||||
else if (reset)
|
||||
@@ -156,7 +159,7 @@ void MotionMaster::DirectExpire(bool reset)
|
||||
DirectDelete(curr);
|
||||
}
|
||||
|
||||
while (!top())
|
||||
while (!empty() && !top())
|
||||
--_top;
|
||||
|
||||
if (empty())
|
||||
@@ -176,7 +179,7 @@ void MotionMaster::DelayedExpire()
|
||||
DelayedDelete(curr);
|
||||
}
|
||||
|
||||
while (!top())
|
||||
while (!empty() && !top())
|
||||
--_top;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user