Merge pull request #1450 from DailyShana/patch-3

fix returning control

ocgcore/operations.cpp

@@ -1022,7 +1022,7 @@ int32 field::control_adjust(uint16 step) {
 	};
 	case 5: {
 		if(core.destroy_set.size())
-			send_to(&core.destroy_set, 0, REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
+			destroy(&core.destroy_set, 0, REASON_RULE, PLAYER_NONE);
 		return TRUE;
 	}
 	}

script/c10000080.lua

@@ -110,9 +110,13 @@ function c10000080.retcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c10000080.retop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetOwner()
-	if c:GetControler()~=c:GetOwner() then
-		Duel.GetControl(c,c:GetOwner())
-	end
+	c:ResetEffect(EFFECT_SET_CONTROL,RESET_CODE)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_SET_CONTROL)
+	e1:SetValue(c:GetOwner())
+	e1:SetReset(RESET_EVENT+0xec0000)
+	c:RegisterEffect(e1)
 end
 function c10000080.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsReleasable() end

script/c93983867.lua

@@ -58,7 +58,11 @@ function c93983867.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function c93983867.retop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=c:GetOwner() then
-		Duel.GetControl(c,c:GetOwner())
-	end
+	c:ResetEffect(EFFECT_SET_CONTROL,RESET_CODE)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_SET_CONTROL)
+	e1:SetValue(c:GetOwner())
+	e1:SetReset(RESET_EVENT+0xec0000)
+	c:RegisterEffect(e1)
 end