Skip to content

Y
ygopro-core
Commit fc467bc4 authored by DailyShana's avatar DailyShana
Browse files
Options

fix field trigger

parent 76824971
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
processor.cpp
View file @ fc467bc4
...@@ -2261,7 +2261,7 @@ int32 field::process_instant_event() { ...@@ -2261,7 +2261,7 @@ int32 field::process_instant_event() {
pr = effects.trigger_f_effect.equal_range(elit->event_code); pr = effects.trigger_f_effect.equal_range(elit->event_code);
for(; pr.first != pr.second; ++pr.first) { for(; pr.first != pr.second; ++pr.first) {
effect* peffect = pr.first->second; effect* peffect = pr.first->second;
if(!peffect->is_condition_check(peffect->handler->current.controler, *elit)) if(!peffect->handler->is_status(STATUS_EFFECT_ENABLED) || !peffect->is_condition_check(peffect->handler->current.controler, *elit))
continue; continue;
peffect->s_range = peffect->handler->current.location; peffect->s_range = peffect->handler->current.location;
peffect->o_range = peffect->handler->current.sequence; peffect->o_range = peffect->handler->current.sequence;
...@@ -2281,7 +2281,7 @@ int32 field::process_instant_event() { ...@@ -2281,7 +2281,7 @@ int32 field::process_instant_event() {
pr = effects.trigger_o_effect.equal_range(elit->event_code); pr = effects.trigger_o_effect.equal_range(elit->event_code);
for(; pr.first != pr.second; ++pr.first) { for(; pr.first != pr.second; ++pr.first) {
effect* peffect = pr.first->second; effect* peffect = pr.first->second;
if(!peffect->is_condition_check(peffect->handler->current.controler, *elit)) if(!peffect->handler->is_status(STATUS_EFFECT_ENABLED) || !peffect->is_condition_check(peffect->handler->current.controler, *elit))
continue; continue;
peffect->s_range = peffect->handler->current.location; peffect->s_range = peffect->handler->current.location;
peffect->o_range = peffect->handler->current.sequence; peffect->o_range = peffect->handler->current.sequence;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment