Fixed warnings in defaultDisableHavokOnLoad and _00E_Theriantrophist_Chymikum

5 months ago · e5e81477e6
parent 82ca8f1a32
commit e5e81477e6
4 changed files with 8 additions and 4 deletions
--- a/scripts/_00e_theriantrophist_chymikum.pex
+++ b/scripts/_00e_theriantrophist_chymikum.pex
--- a/scripts/defaultdisablehavokonload.pex
+++ b/scripts/defaultdisablehavokonload.pex
--- a/source/scripts/_00e_theriantrophist_chymikum.psc
+++ b/source/scripts/_00e_theriantrophist_chymikum.psc
@ -49,8 +49,10 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster)
 		OnChymikumEffectFinish(akTarget)
 	Endif
 	
-	Self.Dispel()
-
+	if akTarget.HasMagicEffect(GetBaseObject())
+		Dispel()
+	endif
+	
 Endevent

 Function OnWolfFormStart()
--- a/source/scripts/defaultdisablehavokonload.psc
+++ b/source/scripts/defaultdisablehavokonload.psc
@ -64,7 +64,9 @@ Function ReleaseToHavok()
 	If myLink  && (myLink.beenSimmed == False)
 		myLink.ReleaseToHavok()
 	EndIf
-	SetMotionType(Motion_Dynamic, True)
-	Self.ApplyHavokImpulse(0, 0, 1, 5)
+	if Is3DLoaded() ; prevent Papyrus errors on a taken object
+		SetMotionType(Motion_Dynamic, True)
+		Self.ApplyHavokImpulse(0, 0, 1, 5)
+	endif
 	; Debug.Trace("Released Havok.")
 EndFunction