Skip to content

Y
ygopro
Commit cea6155d authored by salix5's avatar salix5
Browse files
Options

Merge pull request #1394 from nekrozar/patch-4 

fix EFFECT_BATTLE_DESTROY_REDIRECT
parents 071377b3 55228320
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ocgcore/processor.cpp
View file @ cea6155d
...@@ -3605,7 +3605,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3605,7 +3605,7 @@ int32 field::process_battle_command(uint16 step) {
core.attacker->current.reason_player = core.attack_target->current.controler; core.attacker->current.reason_player = core.attack_target->current.controler;
dest = LOCATION_GRAVE; dest = LOCATION_GRAVE;
seq = 0; seq = 0;
if((peffect = core.attack_target->is_affected_by_effect(EFFECT_BATTLE_DESTROY_REDIRECT))) { if((peffect = core.attack_target->is_affected_by_effect(EFFECT_BATTLE_DESTROY_REDIRECT)) && (core.attacker->data.type & TYPE_MONSTER)) {
dest = peffect->get_value(core.attacker); dest = peffect->get_value(core.attacker);
seq = dest >> 16; seq = dest >> 16;
dest &= 0xffff; dest &= 0xffff;
...@@ -3625,7 +3625,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3625,7 +3625,7 @@ int32 field::process_battle_command(uint16 step) {
core.attack_target->current.reason_player = core.attacker->current.controler; core.attack_target->current.reason_player = core.attacker->current.controler;
dest = LOCATION_GRAVE; dest = LOCATION_GRAVE;
seq = 0; seq = 0;
if((peffect = core.attacker->is_affected_by_effect(EFFECT_BATTLE_DESTROY_REDIRECT))) { if((peffect = core.attacker->is_affected_by_effect(EFFECT_BATTLE_DESTROY_REDIRECT)) && (core.attack_target->data.type & TYPE_MONSTER)) {
dest = peffect->get_value(core.attack_target); dest = peffect->get_value(core.attack_target);
seq = dest >> 16; seq = dest >> 16;
dest &= 0xffff; dest &= 0xffff;
......
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