fix

ocgcore/field.cpp

@@ -594,6 +594,7 @@ void field::swap_deck_and_grave(uint8 playerid) {
 		(*clit)->current.reason_player = core.reason_player;
 		(*clit)->apply_field_effect();
 		(*clit)->enable_field_effect(true);
+		(*clit)->reset(RESET_TOGRAVE, RESET_EVENT);
 	}
 	for(clit = player[playerid].list_main.begin(); clit != player[playerid].list_main.end(); ++clit) {
 		(*clit)->current.location = LOCATION_DECK;
@@ -602,6 +603,7 @@ void field::swap_deck_and_grave(uint8 playerid) {
 		(*clit)->current.reason_player = core.reason_player;
 		(*clit)->apply_field_effect();
 		(*clit)->enable_field_effect(true);
+		(*clit)->reset(RESET_TODECK, RESET_EVENT);
 	}
 	for(clit = ex.begin(); clit != ex.end(); ++clit) {
 		(*clit)->current.location = LOCATION_EXTRA;
@@ -610,6 +612,7 @@ void field::swap_deck_and_grave(uint8 playerid) {
 		(*clit)->current.reason_player = core.reason_player;
 		(*clit)->apply_field_effect();
 		(*clit)->enable_field_effect(true);
+		(*clit)->reset(RESET_TODECK, RESET_EVENT);
 	}
 	player[playerid].list_extra.insert(player[playerid].list_extra.end(), ex.begin(), ex.end());
 	reset_sequence(playerid, LOCATION_GRAVE);

script/c50720316.lua

@@ -15,6 +15,7 @@ function c50720316.initial_effect(c)
 	local e2=e1:Clone()
 	e2:SetDescription(aux.Stringid(50720316,1))
 	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetCondition(c50720316.thcon2)
 	e2:SetTarget(c50720316.thtg2)
 	e2:SetOperation(c50720316.tgop2)
 	c:RegisterEffect(e2)
@@ -38,6 +39,9 @@ function c50720316.tgop1(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
+function c50720316.thcon2(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetHandler():IsReason(REASON_RETURN)
+end
 function c50720316.thfilter2(c)
 	return c:IsSetCard(0x8) and c:IsType(TYPE_MONSTER) and not c:IsCode(50720316) and c:IsAbleToHand()
 end

script/c75500286.lua

@@ -25,12 +25,15 @@ function c75500286.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e1:SetCountLimit(1)
 	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,2)
-	e1:SetOperation(c75500286.tohand)
+	e1:SetCondition(c75500286.thcon)
+	e1:SetOperation(c75500286.thop)
 	e1:SetLabel(0)
 	tg:RegisterEffect(e1)
 end
-function c75500286.tohand(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetTurnPlayer()~=tp then return end
+function c75500286.thcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetTurnPlayer()==tp
+end
+function c75500286.thop(e,tp,eg,ep,ev,re,r,rp)
 	local ct=e:GetLabel()
 	e:GetHandler():SetTurnCounter(ct+1)
 	if ct==1 then