Did some more testing. Found no issues, but did find some cleanup in MagicTarget.cpp.

Author: rfortier

Code/client/Games/Skyrim/Actor.cpp

@@ -360,7 +360,7 @@ bool Actor::RemoveSpell(MagicItem* apSpell) noexcept
     if (!apSpell)
     {
         spdlog::error(__FUNCTION__ ": apSpell is null");
-        return FALSE;
+        return false;
     }
     // spdlog::info(__FUNCTION__ ": removing: {} from actor: {}", apSpell->formID, formID);
     return TiltedPhoques::ThisCall(RealRemoveSpell, this, apSpell);
@@ -388,9 +388,8 @@ bool TP_MAKE_THISCALL(HookRemoveSpell, Actor, MagicItem* apSpell)
     bool result = TiltedPhoques::ThisCall(RealRemoveSpell, apThis, apSpell);
     if (apThis->GetExtension()->IsLocalPlayer() && result)
     {
-        // Log spell info
-        // spdlog::info("Removing spell {}, ID: {} from local player", apSpell->GetName() , apSpell->formID);
-        RemoveSpellEvent removalEvent;
+        //spdlog::info(__FUNCTION__ ": spell: {}, ID: {} from local player", apSpell->GetName() , apSpell->formID);
+       RemoveSpellEvent removalEvent;
 
         removalEvent.TargetId = apThis->formID;
         removalEvent.SpellId = apSpell->formID;

Code/client/Games/Skyrim/Magic/MagicTarget.cpp

@@ -18,7 +18,6 @@
 #include <Effects/ActiveEffect.h>
 
 TP_THIS_FUNCTION(TAddTarget, bool, MagicTarget, MagicTarget::AddTargetData& arData);
-TP_THIS_FUNCTION(TRemoveSpell, bool, Actor, MagicItem* apSpell);
 TP_THIS_FUNCTION(TCheckAddEffectTargetData, bool, MagicTarget::AddTargetData, void* arArgs, float afResistance);
 TP_THIS_FUNCTION(TFindTargets, bool, MagicCaster, float afEffectivenessMult, int32_t* aruiTargetCount,
                  TESBoundObject* apSource, char abLoadCast, char abAdjust);
@@ -27,7 +26,6 @@ TP_THIS_FUNCTION(THasPerk, bool, Actor, TESForm* apPerk, void* apUnk1, double* a
 TP_THIS_FUNCTION(TGetPerkRank, uint8_t, Actor, TESForm* apPerk);
 
 static TAddTarget* RealAddTarget = nullptr;
-static TRemoveSpell* RealRemoveSpell = nullptr;
 static TCheckAddEffectTargetData* RealCheckAddEffectTargetData = nullptr;
 static TFindTargets* RealFindTargets = nullptr;
 static TAdjustForPerks* RealAdjustForPerks = nullptr;
@@ -229,15 +227,13 @@ uint8_t TP_MAKE_THISCALL(HookGetPerkRank, Actor, TESForm* apPerk)
 
 static TiltedPhoques::Initializer s_magicTargetHooks([]() {
     POINTER_SKYRIMSE(TAddTarget, addTarget, 34526);
-    POINTER_SKYRIMSE(TRemoveSpell, removeSpell, 38717);
     POINTER_SKYRIMSE(TCheckAddEffectTargetData, checkAddEffectTargetData, 34525);
     POINTER_SKYRIMSE(TFindTargets, findTargets, 34410);
     POINTER_SKYRIMSE(TAdjustForPerks, adjustForPerks, 34053);
     POINTER_SKYRIMSE(THasPerk, hasPerk, 21622);
     POINTER_SKYRIMSE(TGetPerkRank, getPerkRank, 37698);
 
     RealAddTarget = addTarget.Get();
-    RealRemoveSpell = removeSpell.Get();
     RealCheckAddEffectTargetData = checkAddEffectTargetData.Get();
     RealFindTargets = findTargets.Get();
     RealAdjustForPerks = adjustForPerks.Get();

Code/client/Services/Generic/MagicService.cpp

@@ -447,7 +447,7 @@ void MagicService::OnRemoveSpellEvent(const RemoveSpellEvent& acEvent) noexcept
 
     request.TargetId = serverIdRes.value();
 
-    //spdlog::info("Requesting remove spell with base id {:X} from actor with server id {:X}", request.SpellId.BaseId, request.TargetId);
+    //spdlog::info(__FUNCTION__ ": requesting remove spell with base id {:X} from actor with server id {:X}", request.SpellId.BaseId, request.TargetId);
 
     m_transport.Send(request);
 }
@@ -479,7 +479,7 @@ void MagicService::OnNotifyRemoveSpell(const NotifyRemoveSpell& acMessage) noexc
     }
 
     // Remove the spell from the actor
-    //spdlog::info("Removing spell with form id {:X} from actor with form id {:X}", cSpellId, targetFormId);
+    //spdlog::info(__FUNCTION__ ": removing spell with form id {:X} from actor with form id {:X}", cSpellId, targetFormId);
     pActor->RemoveSpell(pSpell);
 }
 

Code/server/Services/MagicService.cpp

@@ -77,7 +77,7 @@ void MagicService::OnRemoveSpellRequest(const PacketEvent<RemoveSpellRequest>& a
     notify.TargetId = message.TargetId;
     notify.SpellId = message.SpellId;
 
-    //spdlog::info("RemoveSpellRequest: TargetId: {}, Spell baseId: {}", notify.TargetId, notify.SpellId.BaseId);
+    //spdlog::info(__FUNCTION__ ": TargetId: {}, Spell baseId: {}", notify.TargetId, notify.SpellId.BaseId);
 
     const auto entity = static_cast<entt::entity>(message.TargetId);
     if (!GameServer::Get()->SendToPlayersInRange(notify, entity, acMessage.GetSender()))