Merge branch 'master' of https://github.com/Fluorohydride/ygopro-scripts

c7480763.lua

@@ -54,7 +54,7 @@ function c7480763.stop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetLabelObject(tc)
 			e1:SetCondition(c7480763.descon)
 			e1:SetOperation(c7480763.desop)
-			if Duel.GetTurnPlayer()==1-tp then
+			if Duel.GetTurnPlayer()==1-tp and Duel.GetCurrentPhase()==PHASE_END then
 				e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,2)
 				e1:SetValue(Duel.GetTurnCount())
 				tc:RegisterFlagEffect(7480763,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,0,2)

c75147529.lua

@@ -66,7 +66,7 @@ function c75147529.rmop(e,tp,eg,ep,ev,re,r,rp)
 		else
 			reset=RESET_SELF_TURN
 		end
-		if Duel.GetTurnPlayer()==1-tp then
+		if Duel.GetTurnPlayer()==1-tp and Duel.GetCurrentPhase()==PHASE_END then
 			e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,2)
 			e1:SetValue(Duel.GetTurnCount())
 			tc:RegisterFlagEffect(75147529,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+reset,0,2)

c99585850.lua

@@ -88,7 +88,7 @@ function c99585850.rmop(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Duel.Remove(g,POS_FACEUP,REASON_EFFECT)~=0 then
 		local op=Duel.GetOperatedGroup()
 		if op:IsContains(c) then
-			if Duel.GetTurnPlayer()==tp then
+			if Duel.GetTurnPlayer()==tp and Duel.GetCurrentPhase()==PHASE_END then
 				e:GetLabelObject():SetLabel(Duel.GetTurnCount())
 				c:RegisterFlagEffect(99585850,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,2)
 			else