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

operations.cpp

@@ -2954,7 +2954,6 @@ int32 field::special_summon_step(uint16 step, group* targets, card* target, uint
 			core.special_summoning.insert(target);
 		target->enable_field_effect(false);
 		check_card_counter(target, 3, target->summon_player);
-		uint32 move_player = (target->data.type & TYPE_TOKEN) ? target->owner : target->summon_player;
 		if(targets && core.duel_rule >= 4) {
 			uint32 flag1, flag2;
 			int32 ct1 = get_tofield_count(target, playerid, LOCATION_MZONE, target->summon_player, LOCATION_REASON_TOFIELD, zone, &flag1);
@@ -2973,7 +2972,7 @@ int32 field::special_summon_step(uint16 step, group* targets, card* target, uint
 					zone &= flag1;
 			}
 		}
-		move_to_field(target, move_player, playerid, LOCATION_MZONE, positions, FALSE, 0, FALSE, zone);
+		move_to_field(target, target->summon_player, playerid, LOCATION_MZONE, positions, FALSE, 0, FALSE, zone);
 		return FALSE;
 	}
 	case 2: {

processor.cpp

@@ -1455,7 +1455,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
 					continue;
 				peffect->id = infos.field_id++;
 				newchain.triggering_effect = peffect;
-				if(check_hint_timing(peffect))
+				if(check_hint_timing(peffect) || get_cteffect(peffect, check_player, FALSE))
 					core.spe_effect[check_player]++;
 				core.select_chains.push_back(newchain);
 				fc_count++;
@@ -2153,7 +2153,7 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
 					newchain.set_triggering_place(phandler);
 					newchain.triggering_player = priority;
 					core.select_chains.push_back(newchain);
-					if(check_hint_timing(peffect))
+					if(check_hint_timing(peffect) || get_cteffect(peffect, priority, FALSE))
 						core.spe_effect[priority]++;
 				}
 			}