From a25982abf645b53183c9e48c79be4e48ec08dcbe Mon Sep 17 00:00:00 2001 From: stfx Date: Sat, 8 Oct 2011 01:07:09 +0200 Subject: [PATCH] [11815] Fix sending custom GO animation for Type10 GOs Signed-off-by: Schmoozerd --- src/game/GameObject.cpp | 6 ++---- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index caf7ce246..6e8ddbfd6 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -1135,15 +1135,13 @@ void GameObject::Use(Unit* user) SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); SetLootState(GO_ACTIVATED); - uint32 time_to_restore = info->GetAutoCloseTime(); - // this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389) - if (time_to_restore && info->goober.customAnim) + if (info->goober.customAnim) SendGameObjectCustomAnim(GetObjectGuid()); else SetGoState(GO_STATE_ACTIVE); - m_cooldownTime = time(NULL) + time_to_restore; + m_cooldownTime = time(NULL) + info->GetAutoCloseTime(); // cast this spell later if provided spellId = info->goober.spellId; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c1a5bd931..3ec7d261c 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 "11814" + #define REVISION_NR "11815" #endif // __REVISION_NR_H__