From 012b54a63d8deb46990e9295f9fc45f57d0d0440 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 21 Oct 2009 04:48:44 +0400 Subject: [PATCH] [8695] Fix negative auras remain time calculation at loading for pets. In similar ways as recently fixed for players. --- src/game/Pet.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index d1765c092..97bb876c3 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1179,10 +1179,10 @@ void Pet::_LoadAuras(uint32 timediff) // negative effects should continue counting down after logout if (remaintime != -1 && !IsPositiveEffect(spellid, effindex)) { - if(remaintime <= int32(timediff)) + if (remaintime/IN_MILISECONDS <= int32(timediff)) continue; - remaintime -= timediff; + remaintime -= timediff*IN_MILISECONDS; } // prevent wrong values of remaincharges diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5eeaa5833..f9ad0acad 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8694" + #define REVISION_NR "8695" #endif // __REVISION_NR_H__