From f8b411dd7bd884af1990af23c5ce62c96f660540 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 2 Aug 2022 10:56:22 +0300 Subject: [PATCH] [Client] Send PlayerCooldowns only when local player uses power --- apps/openmw/mwmechanics/spellcasting.cpp | 14 ++++++++++++++ apps/openmw/mwmechanics/spells.cpp | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index 818e80b81..371405d4d 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -808,6 +808,20 @@ namespace MWMechanics // A power can be used once per 24h if (spell->mData.mType == ESM::Spell::ST_Power) stats.getSpells().usePower(spell); + + /* + Start of tes3mp addition + + Send an ID_PLAYER_COOLDOWNS packet every time a power is used here by the local player + */ + if (spell->mData.mType == ESM::Spell::ST_Power && mCaster == getPlayer()) + { + mwmp::Main::get().getLocalPlayer()->sendCooldownChange(spell->mId, MWBase::Environment::get().getWorld()->getTimeStamp().getDay(), + MWBase::Environment::get().getWorld()->getTimeStamp().getHour()); + } + /* + End of tes3mp addition + */ } if (!mManualSpell && mCaster == getPlayer() && spellIncreasesSkill(spell)) diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp index df354cdb8..808035844 100644 --- a/apps/openmw/mwmechanics/spells.cpp +++ b/apps/openmw/mwmechanics/spells.cpp @@ -380,17 +380,6 @@ namespace MWMechanics void Spells::usePower(const ESM::Spell* spell) { mUsedPowers[spell] = MWBase::Environment::get().getWorld()->getTimeStamp(); - - /* - Start of tes3mp addition - - Send an ID_PLAYER_COOLDOWN packet every time a cooldown is recorded here - */ - mwmp::Main::get().getLocalPlayer()->sendCooldownChange(spell->mId, MWBase::Environment::get().getWorld()->getTimeStamp().getDay(), - MWBase::Environment::get().getWorld()->getTimeStamp().getHour()); - /* - End of tes3mp addition - */ } /*