Update c99999506.lua

script/c99999506.lua

@@ -24,21 +24,27 @@ end
 function c99999506.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=re:GetHandler()
-	if Duel.NegateActivation(ev) then
-		if Duel.IsExistingMatchingCard(c99999506.cfilter,tp,LOCATION_MZONE,0,1,nil)
-			and tc:IsRelateToEffect(re) and tc:IsFaceup() then
-			local e1=Effect.CreateEffect(c)
-			e1:SetType(EFFECT_TYPE_SINGLE)
-			e1:SetCode(EFFECT_DISABLE)
-			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-			tc:RegisterEffect(e1)
-			local e2=Effect.CreateEffect(c)
-			e2:SetType(EFFECT_TYPE_SINGLE)
-			e2:SetCode(EFFECT_DISABLE_EFFECT)
-			e2:SetValue(RESET_TURN_SET)
-			e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-			tc:RegisterEffect(e2)
-			tc:RegisterFlagEffect(99999506,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(99999506,1))
+	Duel.NegateActivation(ev)
+	if Duel.IsExistingMatchingCard(c99999506.cfilter,tp,LOCATION_MZONE,0,1,nil)
+		and tc:IsRelateToEffect(re) and tc:IsFaceup() and tc:IsCanBeDisabledByEffect(e) then
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_DISABLE)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+		tc:RegisterEffect(e1)
+		local e2=Effect.CreateEffect(c)
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_DISABLE_EFFECT)
+		e2:SetValue(RESET_TURN_SET)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
+		tc:RegisterEffect(e2)
+		if tc:IsType(TYPE_TRAPMONSTER) then
+		    local e3=Effect.CreateEffect(c)
+		    e3:SetType(EFFECT_TYPE_SINGLE)
+		    e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
+		    e3:SetReset(RESET_EVENT+RESETS_STANDARD)
+		    tc:RegisterEffect(e3)
 		end
+		tc:RegisterFlagEffect(99999506,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(99999506,1))
 	end
 end
\ No newline at end of file