Merge remote-tracking branch 'origin/master' into mmaps
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Movement/MotionMaster.cpp src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
commit
e6a07076c3
126 files changed
+783
-859
No files matched your search
@@ -326,7 +326,7 @@ void Map::DeleteFromWorld(Player* player)
|
||||
|
||||
void Map::EnsureGridCreated(const GridCoord &p)
|
||||
{
|
||||
TRINITY_GUARD(ACE_Thread_Mutex, Lock);
|
||||
TRINITY_GUARD(ACE_Thread_Mutex, GridLock);
|
||||
EnsureGridCreated_i(p);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user