revert

this commit revert f87e6689

field.cpp

@@ -1207,11 +1207,6 @@ void field::remove_oath_effect(effect* reason_effect) {
 void field::reset_phase(uint32 phase) {
 	for(auto eit = effects.pheff.begin(); eit != effects.pheff.end();) {
 		auto rm = eit++;
-		// work around: skip turn still raise reset_phase(PHASE_END)
-		// without this taking control only for one turn will be returned when skipping turn
-		// RESET_TURN_END should be introduced
-		//if((*rm)->code == EFFECT_SET_CONTROL)
-		//	continue;
 		if((*rm)->reset(phase, RESET_PHASE)) {
 			if((*rm)->is_flag(EFFECT_FLAG_FIELD_ONLY))
 				remove_effect((*rm));

processor.cpp

@@ -3489,6 +3489,8 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 			tag_swap(turn_player);
 		if(is_player_affected_by_effect(infos.turn_player, EFFECT_SKIP_TURN)) {
 			core.units.begin()->step = 17;
+			reset_phase(PHASE_DRAW);
+			reset_phase(PHASE_STANDBY);
 			reset_phase(PHASE_END);
 			adjust_all();
 			return FALSE;