mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-05 07:26:30 +00:00
Code Issues Releases Wiki Activity

[Client] Fix active spell sync using actor IDs tracked in ActiveSpells

Browse source
This commit is contained in:
David Cernat 2021-10-12 02:01:05 +02:00
parent e6a1f0889f
commit 63c956e1d2
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwmechanics/activespells.cpp
View file

@ -43,17 +43,22 @@ namespace MWMechanics
/* /*
Start of tes3mp addition Start of tes3mp addition
Whenever a player loses an active spell, send an ID_PLAYER_SPELLS_ACTIVE packet to the server with it Whenever the local player loses an active spell, send an ID_PLAYER_SPELLS_ACTIVE packet to the server with it
*/
bool isStackingSpell = !MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(iter->first);
Whenever a local actor loses an active spell, send an ID_ACTOR_SPELLS_ACTIVE packet to the server with it
*/
if (this == &MWMechanics::getPlayer().getClass().getCreatureStats(MWMechanics::getPlayer()).getActiveSpells()) if (this == &MWMechanics::getPlayer().getClass().getCreatureStats(MWMechanics::getPlayer()).getActiveSpells())
{ {
mwmp::Main::get().getLocalPlayer()->sendSpellsActiveRemoval(iter->first, isStackingSpell, iter->second.mTimeStamp); mwmp::Main::get().getLocalPlayer()->sendSpellsActiveRemoval(iter->first,
MechanicsHelper::isStackingSpell(iter->first), iter->second.mTimeStamp);
} }
else if (mwmp::Main::get().getCellController()->isLocalActor(MechanicsHelper::getCurrentActor())) else
{ {
mwmp::Main::get().getCellController()->getLocalActor(MechanicsHelper::getCurrentActor())->sendSpellsActiveRemoval(iter->first, isStackingSpell, iter->second.mTimeStamp); MWWorld::Ptr actorPtr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(getActorId());
if (mwmp::Main::get().getCellController()->isLocalActor(actorPtr))
mwmp::Main::get().getCellController()->getLocalActor(actorPtr)->sendSpellsActiveRemoval(iter->first,
MechanicsHelper::isStackingSpell(iter->first), iter->second.mTimeStamp);
} }
/* /*
End of tes3mp addition End of tes3mp addition
@ -233,9 +238,12 @@ namespace MWMechanics
{ {
mwmp::Main::get().getLocalPlayer()->sendSpellsActiveAddition(id, isStackingSpell, params); mwmp::Main::get().getLocalPlayer()->sendSpellsActiveAddition(id, isStackingSpell, params);
} }
else if (mwmp::Main::get().getCellController()->isLocalActor(MechanicsHelper::getCurrentActor())) else
{ {
mwmp::Main::get().getCellController()->getLocalActor(MechanicsHelper::getCurrentActor())->sendSpellsActiveAddition(id, isStackingSpell, params); MWWorld::Ptr actorPtr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(getActorId());
if (mwmp::Main::get().getCellController()->isLocalActor(actorPtr))
mwmp::Main::get().getCellController()->getLocalActor(actorPtr)->sendSpellsActiveAddition(id, isStackingSpell, params);
} }
} }
/* /*