From 931d3a231e49c1bc4bfd7e07a7cbeef33b2cf06e Mon Sep 17 00:00:00 2001
From: YiLong-jin <83805253+YiLong-jin@users.noreply.github.com>
Date: Thu, 26 Dec 2024 14:53:33 +0800
Subject: [PATCH] fix RegisterMergedDelayedEvent_ToSingleCard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This modification addresses two issues:

In the case of special summoning "クシャトリラ・アライズハート" using the effect of "RUM－ソウル・シェイブ・フォース," it triggered the effect of "幻影騎士団ラスティ・バルディッシュ" to destroy itself, after which the effect of "クシャトリラ・アライズハート" would not activate.
The effects triggered by cards in hand when creating a point in time using this function cannot activate if they are triggered after the point in time when the cards are added to hand.
The aforementioned two errors have been resolved here.The test of the second change needs to be done at the same time as another PR test I submitted, which added this method to "朔夜しぐれ".
---
 utility.lua | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/utility.lua b/utility.lua
index f5b248796..9bfbd7150 100644
--- a/utility.lua
+++ b/utility.lua
@@ -1675,7 +1675,7 @@ end
 function Auxiliary.ThisCardMovedToPublicResetCheck_ToSingleCard(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetOwner()
 	local g=e:GetLabelObject()
-	if c:IsFaceup() or c:IsPublic() then 
+	if c:IsFaceup() then 
 		g:Clear()
 	end 
 end 
@@ -1683,13 +1683,6 @@ function Auxiliary.MergedDelayEventCheck1_ToSingleCard(e,tp,eg,ep,ev,re,r,rp)
 	local g=e:GetLabelObject()
 	local c=e:GetOwner()
 	g:Merge(eg)
-	if Duel.CheckEvent(EVENT_MOVE) then 
-		_,meg=Duel.CheckEvent(EVENT_MOVE,true)
-		local c=e:GetOwner()
-		if meg:IsContains(c) and (c:IsFaceup() or c:IsPublic()) then 
-			g:Clear()
-		end 
-	end 
 	if Duel.GetCurrentChain()==0 and #g>0 and not Duel.CheckEvent(EVENT_CHAIN_END) then
 		local _eg=g:Clone()
 		Duel.RaiseEvent(_eg,e:GetLabel(),re,r,rp,ep,ev)
@@ -1701,7 +1694,7 @@ function Auxiliary.MergedDelayEventCheck2_ToSingleCard(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.CheckEvent(EVENT_MOVE) then 
 		_,meg=Duel.CheckEvent(EVENT_MOVE,true)
 		local c=e:GetOwner()
-		if meg:IsContains(c) and (c:IsFaceup() or c:IsPublic()) then 
+		if meg:IsContains(c) and c:IsFaceup() then 
 			g:Clear()
 		end 
 	end