ybb

expansions/script/c16104411.lua

@@ -253,6 +253,9 @@ function cm.togop(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) then
 		local g=tc:GetColumnGroup():Filter(Card.IsControler,nil,1-tp)
 		if g:GetCount()>0 then
+			if tc:IsControler(1-tp) then
+				g:AddCard(tc)
+			end
 			Duel.SendtoGrave(g,REASON_EFFECT)
 		end
 	end

expansions/script/c16104419.lua

@@ -126,6 +126,7 @@ function cm.discon(e,tp)
 	return Duel.GetMatchingGroupCount(nil,e:GetHandlerPlayer(),0,LOCATION_MZONE,nil)==1
 end
 function cm.disop(e,tp,eg,ep,ev,re,r,rp)
-	if ep==tp and (re:GetActivateLocation()&LOCATION_ONFIELD~=0 or re:IsHasType(EFFECT_TYPE_ACTIVATE)) then return end
-	Duel.NegateEffect(ev)
+	if ep~=tp and (re:GetActivateLocation()&LOCATION_ONFIELD~=0 or re:IsHasType(EFFECT_TYPE_ACTIVATE)) then 
+		Duel.NegateEffect(ev)
+	end
 end
\ No newline at end of file