Merge branch 'master' into patch-select-chain-forced

card.cpp

@@ -2280,12 +2280,13 @@ int32_t card::leave_field_redirect(uint32_t reason) {
 		return 0;
 	filter_effect(EFFECT_LEAVE_FIELD_REDIRECT, &es);
 	for(effect_set::size_type i = 0; i < es.size(); ++i) {
-		redirect = es[i]->get_value(this, 0);
+		effect* peffect = es[i];
+		redirect = peffect->get_value(this, 0);
 		if((redirect & LOCATION_HAND) && !is_affected_by_effect(EFFECT_CANNOT_TO_HAND) && pduel->game_field->is_player_can_send_to_hand(es[i]->get_handler_player(), this))
 			redirects |= redirect;
 		else if((redirect & LOCATION_DECK) && !is_affected_by_effect(EFFECT_CANNOT_TO_DECK) && pduel->game_field->is_player_can_send_to_deck(es[i]->get_handler_player(), this))
 			redirects |= redirect;
-		else if((redirect & LOCATION_REMOVED) && !is_affected_by_effect(EFFECT_CANNOT_REMOVE) && pduel->game_field->is_player_can_remove(es[i]->get_handler_player(), this, REASON_EFFECT))
+		else if((redirect & LOCATION_REMOVED) && !is_affected_by_effect(EFFECT_CANNOT_REMOVE) && pduel->game_field->is_player_can_remove(es[i]->get_handler_player(), this, REASON_EFFECT | REASON_REDIRECT, peffect))
 			redirects |= redirect;
 	}
 	if(redirects & LOCATION_REMOVED)
@@ -2318,12 +2319,13 @@ int32_t card::destination_redirect(uint8_t destination, uint32_t reason) {
 	else
 		return 0;
 	for(effect_set::size_type i = 0; i < es.size(); ++i) {
-		redirect = es[i]->get_value(this, 0);
+		effect* peffect = es[i];
+		redirect = peffect->get_value(this, 0);
 		if((redirect & LOCATION_HAND) && !is_affected_by_effect(EFFECT_CANNOT_TO_HAND) && pduel->game_field->is_player_can_send_to_hand(es[i]->get_handler_player(), this))
 			return redirect;
 		if((redirect & LOCATION_DECK) && !is_affected_by_effect(EFFECT_CANNOT_TO_DECK) && pduel->game_field->is_player_can_send_to_deck(es[i]->get_handler_player(), this))
 			return redirect;
-		if((redirect & LOCATION_REMOVED) && !is_affected_by_effect(EFFECT_CANNOT_REMOVE) && pduel->game_field->is_player_can_remove(es[i]->get_handler_player(), this, REASON_EFFECT))
+		if((redirect & LOCATION_REMOVED) && !is_affected_by_effect(EFFECT_CANNOT_REMOVE) && pduel->game_field->is_player_can_remove(es[i]->get_handler_player(), this, REASON_EFFECT | REASON_REDIRECT, peffect))
 			return redirect;
 		if((redirect & LOCATION_GRAVE) && !is_affected_by_effect(EFFECT_CANNOT_TO_GRAVE) && pduel->game_field->is_player_can_send_to_grave(es[i]->get_handler_player(), this))
 			return redirect;

effect.cpp

@@ -805,10 +805,14 @@ effect* effect::clone() {
 	return ceffect;
 }
 card* effect::get_owner() const {
-	if(active_handler)
+	if (type & EFFECT_TYPE_XMATERIAL) {
+		if (active_handler)
 			return active_handler;
-	if(type & EFFECT_TYPE_XMATERIAL)
+		if (handler->overlay_target)
 			return handler->overlay_target;
+		if (last_handler)
+			return last_handler;
+	}
 	return owner;
 }
 uint8_t effect::get_owner_player() const {
@@ -817,10 +821,14 @@ uint8_t effect::get_owner_player() const {
 	return get_owner()->current.controler;
 }
 card* effect::get_handler() const {
-	if(active_handler)
+	if (type & EFFECT_TYPE_XMATERIAL) {
+		if (active_handler)
 			return active_handler;
-	if(type & EFFECT_TYPE_XMATERIAL)
+		if (handler->overlay_target)
 			return handler->overlay_target;
+		if (last_handler)
+			return last_handler;
+	}
 	return handler;
 }
 uint8_t effect::get_handler_player() const {

effect.h

@@ -54,6 +54,7 @@ public:
 	uint16_t active_location{ 0 };
 	uint16_t active_sequence{ 0 };
 	card* active_handler{ nullptr };
+	card* last_handler{ nullptr };
 	std::vector<lua_Integer> label;
 	int32_t label_object{ 0 };
 	int32_t condition{ 0 };

field.cpp

@@ -3367,7 +3367,9 @@ int32_t field::is_player_can_send_to_deck(uint8_t playerid, card * pcard) {
 	}
 	return TRUE;
 }
-int32_t field::is_player_can_remove(uint8_t playerid, card * pcard, uint32_t reason) {
+int32_t field::is_player_can_remove(uint8_t playerid, card* pcard, uint32_t reason, effect* reason_effect) {
+	if(!reason_effect)
+		reason_effect = core.reason_effect;
 	effect_set eset;
 	filter_player_effect(playerid, EFFECT_CANNOT_REMOVE, &eset);
 	for(effect_set::size_type i = 0; i < eset.size(); ++i) {
@@ -3377,7 +3379,7 @@ int32_t field::is_player_can_remove(uint8_t playerid, card * pcard, uint32_t rea
 		pduel->lua->add_param(pcard, PARAM_TYPE_CARD);
 		pduel->lua->add_param(playerid, PARAM_TYPE_INT);
 		pduel->lua->add_param(reason, PARAM_TYPE_INT);
-		pduel->lua->add_param(core.reason_effect, PARAM_TYPE_EFFECT);
+		pduel->lua->add_param(reason_effect, PARAM_TYPE_EFFECT);
 		if(pduel->lua->check_condition(eset[i]->target, 5))
 			return FALSE;
 	}

field.h

@@ -500,7 +500,7 @@ public:
 	int32_t is_player_can_send_to_grave(uint8_t playerid, card* pcard);
 	int32_t is_player_can_send_to_hand(uint8_t playerid, card* pcard);
 	int32_t is_player_can_send_to_deck(uint8_t playerid, card* pcard);
-	int32_t is_player_can_remove(uint8_t playerid, card* pcard, uint32_t reason);
+	int32_t is_player_can_remove(uint8_t playerid, card* pcard, uint32_t reason, effect* reason_effect = nullptr);
 	int32_t is_chain_negatable(uint8_t chaincount);
 	int32_t is_chain_disablable(uint8_t chaincount);
 	int32_t is_chain_disabled(uint8_t chaincount);

processor.cpp

@@ -4069,7 +4069,10 @@ int32_t field::add_chain(uint16_t step) {
 		if((peffect->card_type & (TYPE_TRAP | TYPE_MONSTER)) == (TYPE_TRAP | TYPE_MONSTER))
 			peffect->card_type -= TYPE_TRAP;
 		peffect->set_active_type();
+		if (peffect->type & EFFECT_TYPE_XMATERIAL) {
 			peffect->active_handler = peffect->handler->overlay_target;
+			peffect->last_handler = peffect->handler->overlay_target;
+		}
 		clit.chain_count = (uint8_t)core.current_chain.size() + 1;
 		clit.target_cards = 0;
 		clit.target_player = PLAYER_NONE;