fix

script/c61307542.lua

@@ -42,11 +42,11 @@ end
 function c61307542.efilter(e,re)
 	return re:IsActiveType(TYPE_MONSTER) and re:GetOwner()~=e:GetOwner()
 end
-function c61307542.cfilter(c)
-	return c:IsType(TYPE_TRAP) and c:IsPreviousLocation(LOCATION_SZONE) and c:GetPreviousSequence()<5
+function c61307542.cfilter(c,tp)
+	return c:IsType(TYPE_TRAP) and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_SZONE) and c:GetPreviousSequence()<5
 end
 function c61307542.condition(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c61307542.cfilter,1,nil)
+	return eg:IsExists(c61307542.cfilter,1,nil,tp)
 end
 function c61307542.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,1) end

script/c61420130.lua

@@ -37,13 +37,13 @@ function c61420130.activate(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_SET_ATTACK_FINAL)
-		e1:SetReset(RESET_EVENT+0x1fe0000)
+		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
 		e1:SetValue(tc:GetAttack()/2)
 		tc:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_SET_DEFENCE_FINAL)
-		e2:SetReset(RESET_EVENT+0x1fe0000)
+		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
 		e2:SetValue(tc:GetDefence()/2)
 		tc:RegisterEffect(e2)
 	end