Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

c7422bb8 · mercury233 · 5df6b38d · 3ef2b61b · c7422bb8
Commit c7422bb8 authored Sep 16, 2019 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

operations.cpp operations.cpp +5 -1

No files found.
--- a/operations.cpp
+++ b/operations.cpp
@@ -59,7 +59,11 @@ void field::change_chain_effect(uint8 chaincount, int32 rep_op) {
 		return;
 	if(chaincount > core.current_chain.size() || chaincount < 1)
 		chaincount = core.current_chain.size();
-	core.current_chain[chaincount - 1].replace_op = rep_op;
+	chain& pchain = core.current_chain[chaincount - 1];
+	pchain.replace_op = rep_op;
+	if((pchain.triggering_effect->type & EFFECT_TYPE_ACTIVATE) && (pchain.triggering_effect->handler->current.location == LOCATION_SZONE)) {
+		pchain.triggering_effect->handler->set_status(STATUS_LEAVE_CONFIRMED, TRUE);
+	}
 }
 void field::change_target(uint8 chaincount, group* targets) {
 	if(core.current_chain.size() == 0)