nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-31 09:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
This commit is contained in:
郑佩茹
2022-07-27 09:11:50 -06:00
parent 27300e9fdf bad616c68a
commit 6ad65508af
140 changed files with 6677 additions and 4753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/Utilities/Timer.h
View File

@@ -231,7 +231,7 @@ private:
struct TimeTrackerSmall
{
public:
TimeTrackerSmall(uint32 expiry = 0)
TimeTrackerSmall(int32 expiry = 0)
: i_expiryTime(expiry)
{
}
@@ -246,7 +246,7 @@ public:
return i_expiryTime <= 0;
}
void Reset(uint32 interval)
void Reset(int32 interval)
{
i_expiryTime = interval;
}