Skip to content

Commit 4f552c5

Browse files
authored
Fix rare crash in HookHasPerk caused by null actor extension (#818)
1 parent 7bf195c commit 4f552c5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#include "MagicTarget.h"
22

33
#include <Actor.h>
4-
#include <Games/ActorExtension.h>
54
#include <World.h>
6-
#include <Games/ActorExtension.h>
75
#include "EffectItem.h"
86

97
#include <Structs/Skyrim/AnimationGraphDescriptor_WerewolfBehavior.h>
@@ -12,6 +10,7 @@
1210
#include <Events/AddTargetEvent.h>
1311
#include <Events/HitEvent.h>
1412

13+
#include <Games/ActorExtension.h>
1514
#include <Games/Overrides.h>
1615
#include <PlayerCharacter.h>
1716

@@ -204,7 +203,9 @@ void TP_MAKE_THISCALL(HookAdjustForPerks, ActiveEffect, Actor* apCaster, MagicTa
204203

205204
bool TP_MAKE_THISCALL(HookHasPerk, Actor, TESForm* apPerk, void* apUnk1, double* afReturnValue)
206205
{
207-
if (apThis && apThis->GetExtension()->IsRemotePlayer())
206+
ActorExtension* pExtension = apThis ? apThis->GetExtension() : nullptr;
207+
208+
if (pExtension && pExtension->IsRemotePlayer())
208209
{
209210
if (apPerk && apPerk->formID == 0x581f9)
210211
{

0 commit comments

Comments
 (0)