Skip to content

Y
ygopro-core
Commit 37a2b3e7 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'mercury/patch-self-tograve-re' into develop

parents e3073cdf a4471473
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
operations.cpp
View file @ 37a2b3e7
...@@ -260,11 +260,13 @@ void field::send_to(card_set* targets, effect* reason_effect, uint32 reason, uin ...@@ -260,11 +260,13 @@ void field::send_to(card_set* targets, effect* reason_effect, uint32 reason, uin
return; return;
for(auto& pcard : *targets) { for(auto& pcard : *targets) {
pcard->temp.reason = pcard->current.reason; pcard->temp.reason = pcard->current.reason;
pcard->temp.reason_effect = pcard->current.reason_effect;
pcard->temp.reason_player = pcard->current.reason_player;
pcard->current.reason = reason; pcard->current.reason = reason;
pcard->current.reason_effect = reason_effect; if(reason_player != PLAYER_SELFDES) {
pcard->current.reason_player = reason_player; pcard->temp.reason_effect = pcard->current.reason_effect;
pcard->temp.reason_player = pcard->current.reason_player;
pcard->current.reason_effect = reason_effect;
pcard->current.reason_player = reason_player;
}
uint32 p = playerid; uint32 p = playerid;
// send to hand from deck and playerid not given => send to the hand of controler // send to hand from deck and playerid not given => send to the hand of controler
if(p == PLAYER_NONE && (destination & LOCATION_HAND) && (pcard->current.location & LOCATION_DECK) && pcard->current.controler == reason_player) if(p == PLAYER_NONE && (destination & LOCATION_HAND) && (pcard->current.location & LOCATION_DECK) && pcard->current.controler == reason_player)
...@@ -1273,7 +1275,7 @@ int32 field::self_destroy(uint16 step, card* ucard, int32 p) { ...@@ -1273,7 +1275,7 @@ int32 field::self_destroy(uint16 step, card* ucard, int32 p) {
pcard->temp.reason_player = pcard->current.reason_player; pcard->temp.reason_player = pcard->current.reason_player;
pcard->current.reason_effect = peffect; pcard->current.reason_effect = peffect;
pcard->current.reason_player = peffect->get_handler_player(); pcard->current.reason_player = peffect->get_handler_player();
send_to(pcard, 0, REASON_EFFECT, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP); send_to(pcard, 0, REASON_EFFECT, PLAYER_SELFDES, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
} }
core.self_tograve_set.erase(it); core.self_tograve_set.erase(it);
core.units.begin()->step = 19; core.units.begin()->step = 19;
......
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