From b36a4fd8c313437d744de5a231763965640e14e0 Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Tue, 12 Jan 2021 20:35:07 +0300 Subject: [PATCH] Process CPlayer::m_DefEmoteReset in CPlayer --- src/game/server/entities/character.cpp | 7 ------- src/game/server/player.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 690928bb8..9fcff9ee0 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -2193,13 +2193,6 @@ void CCharacter::DDRacePostCoreTick() { m_Time = (float)(Server()->Tick() - m_StartTime) / ((float)Server()->TickSpeed()); - if(m_pPlayer->m_DefEmoteReset >= 0 && m_pPlayer->m_DefEmoteReset <= Server()->Tick()) - { - m_pPlayer->m_DefEmoteReset = -1; - m_EmoteType = m_pPlayer->m_DefEmote = EMOTE_NORMAL; - m_EmoteStop = -1; - } - if(m_EndlessHook || (m_Super && g_Config.m_SvEndlessSuperHook)) m_Core.m_HookTick = 0; diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index e49d1800e..d7f68c231 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -269,6 +269,12 @@ void CPlayer::Tick() GameServer()->SendTuningParams(m_ClientID, m_TuneZone); } + if(m_DefEmoteReset >= 0 && m_DefEmoteReset <= Server()->Tick()) + { + m_DefEmoteReset = -1; + m_DefEmote = EMOTE_NORMAL; + } + if(m_Halloween && m_pCharacter && !m_pCharacter->IsPaused()) { if(1200 - ((Server()->Tick() - m_pCharacter->GetLastAction()) % (1200)) < 5)