E

expansions/script/c12892007.lua

@@ -21,6 +21,7 @@ function c12892007.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(0,1)
 	e3:SetValue(cm.actlimit)
+	e3:SetCondition(cm.actcon)
 	c:RegisterEffect(e3)
     local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE)
@@ -46,6 +47,7 @@ function cm.cfilter(c,tp)
 	return c:IsFaceup() and c:IsSetCard(0x8a72) and c:IsType(TYPE_XYZ)
 		and c:CheckRemoveOverlayCard(tp,1,REASON_COST)
 end
+
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DEATTACHFROM)
@@ -53,7 +55,8 @@ function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	c:RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function cm.actcon(e)
-	return Duel.GetAttacker()==e:GetHandler() or Duel.GetAttackTarget()==e:GetHandler()
+	local c=e:GetHandler()
+	return (Duel.GetAttacker()==c and c:GetBattleTarget()) or Duel.GetAttackTarget()==c
 end
 function cm.actlimit(e,re,tp)
 	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP)

expansions/script/c24865318.lua

@@ -128,7 +128,7 @@ function c24865318.op(e,tp,eg,ep,ev,re,r,rp)
     --从卡组选一张「量子妖海-狄拉克」加入手卡或在把这张卡发动的玩家的场上发动
     if sel==2 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-        local c=e:GetHandler()
+        local c=re:GetHandler()
 		Duel.Remove(c,POS_FACEUP,REASON_EFFECT)
 	end
 end