Skip to content

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

fix reset control in end phase

parent f87e6689
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
processor.cpp
View file @ 0a9318e3
...@@ -1409,18 +1409,18 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1409,18 +1409,18 @@ int32 field::process_phase_event(int16 step, int32 phase) {
effect* peffect = *eit++; effect* peffect = *eit++;
if(peffect->code != EFFECT_SET_CONTROL) if(peffect->code != EFFECT_SET_CONTROL)
continue; continue;
if(peffect->get_owner_player() != check_player)
continue;
if(!(peffect->reset_flag & phase)) if(!(peffect->reset_flag & phase))
continue; continue;
uint8 pid = peffect->get_handler_player(); uint8 pid = peffect->get_handler_player();
if(pid != check_player)
continue;
uint8 tp = infos.turn_player; uint8 tp = infos.turn_player;
if(!(((peffect->reset_flag & RESET_SELF_TURN) && pid == tp) || ((peffect->reset_flag & RESET_OPPO_TURN) && pid != tp))) if(!(((peffect->reset_flag & RESET_SELF_TURN) && pid == tp) || ((peffect->reset_flag & RESET_OPPO_TURN) && pid != tp)))
continue; continue;
if(peffect->reset_count != 1) if(peffect->reset_count != 1)
continue; continue;
card* phandler = peffect->get_handler(); card* phandler = peffect->get_handler();
if(peffect->get_owner_player() != phandler->current.controler) { if(pid != phandler->current.controler) {
if(peffect->is_flag(EFFECT_FLAG_FIELD_ONLY)) if(peffect->is_flag(EFFECT_FLAG_FIELD_ONLY))
remove_effect(peffect); remove_effect(peffect);
else else
......
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