From 7690f3c90e260bad793c774a16371387754dfc6f Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 20 Apr 2021 17:48:16 +0200 Subject: [PATCH] [Client] Don't apply spell effects unilaterally on DedicatedActors --- apps/openmw/mwmechanics/spellcasting.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index ff5220a11..53d4713a8 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -244,10 +244,10 @@ namespace MWMechanics /* Start of tes3mp change (major) - If the target is a DedicatedPlayer, don't apply effects to them unilaterally on this client - and wait for the server's response to the other client to apply the effects for us + If the target is a DedicatedPlayer or DedicatedActor, don't apply effects to them unilaterally on this + client and wait for the server's response to the other client to apply the effects for us */ - if (effect.mDuration == 0 && !mwmp::PlayerList::isDedicatedPlayer(target)) + if (effect.mDuration == 0 && !mwmp::PlayerList::isDedicatedPlayer(target) && !mwmp::Main::get().getCellController()->isDedicatedActor(target)) /* End of tes3mp change (major) */ @@ -290,10 +290,10 @@ namespace MWMechanics /* Start of tes3mp change (major) - If the target is a DedicatedPlayer, don't apply effects to them unilaterally on this client - and wait for the server's response to the other client to apply the effects for us + If the target is a DedicatedPlayer or DedicatedActor, don't apply effects to them unilaterally on this + client and wait for the server's response to the other client to apply the effects for us */ - else if (!mwmp::PlayerList::isDedicatedPlayer(target)) + else if (!mwmp::PlayerList::isDedicatedPlayer(target) && !mwmp::Main::get().getCellController()->isDedicatedActor(target)) /* End of tes3mp change (major) */