Merge branch 'master' into mc_master

c58570206.lua

@@ -85,7 +85,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local tg=sg:Select(tp,1,1,nil)
 	local tc=tg:GetFirst()
-	if not tc then return end
+	if tc then
 		if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or ce and not Duel.SelectYesNo(tp,ce:GetDescription())) then
 			aux.FCheckAdditional=s.fcheck1(ct)
 			aux.FGoalCheckAdditional=s.fcheck2
@@ -116,6 +116,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		end
 		Duel.SpecialSummonComplete()
 		tc:CompleteProcedure()
+	end
 	aux.FCheckAdditional=nil
 	aux.FGoalCheckAdditional=nil
 end

c61944066.lua

@@ -54,7 +54,7 @@ function s.cfilter2(c)
 	return c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT)
 end
 function s.lpcon(e,tp,eg,ep,ev,re,r,rp)
-	return re:GetHandler():IsAllTypes(TYPE_RITUAL+TYPE_MONSTER)
+	return re and re:GetHandler():IsAllTypes(TYPE_RITUAL+TYPE_MONSTER)
 		and eg:IsExists(s.cfilter2,1,nil)
 end
 function s.lpop(e,tp,eg,ep,ev,re,r,rp)