From d2f126710fb8b0a22a9b73a444a6b8ff9c3b9750 Mon Sep 17 00:00:00 2001 From: Synful-Syn Date: Sun, 24 Jul 2022 13:29:13 -0400 Subject: [PATCH] chore(Cleanup): Merge redundant `if` in Totem::Update() (#12423) TotemUpdate-too-long --- src/server/game/Entities/Totem/Totem.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index 1ed444bb4..73486f979 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -34,20 +34,13 @@ Totem::Totem(SummonPropertiesEntry const* properties, ObjectGuid owner) : Minion void Totem::Update(uint32 time) { Unit* owner = GetOwner(); - if (!owner || !owner->IsAlive() || !IsAlive()) + if (!owner || !owner->IsAlive() || !IsAlive() || m_duration <= time) { UnSummon(); // remove self return; } - if (m_duration <= time) - { - UnSummon(); // remove self - return; - } - else - m_duration -= time; - + m_duration -= time; Creature::Update(time); }