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

effect.cpp

@@ -261,6 +261,8 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con
 			card* phandler = get_handler();
 			if(!(phandler->get_type() & TYPE_MONSTER) && (get_active_type() & TYPE_MONSTER))
 				return FALSE;
+			if((phandler->get_type() & TYPE_CONTINUOUS) && (phandler->get_type() & TYPE_EQUIP))
+				return FALSE;
 			if(!neglect_faceup && (phandler->current.location & (LOCATION_ONFIELD | LOCATION_REMOVED))) {
 				if(!phandler->is_position(POS_FACEUP) && !is_flag(EFFECT_FLAG_SET_AVAILABLE))
 					return FALSE;
@@ -580,7 +582,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
 	case RESET_PHASE: {
 		if(!(reset_flag & RESET_PHASE))
 			return FALSE;
-		uint8 pid = get_handler_player();
+		uint8 pid = get_owner_player();
 		uint8 tp = handler->pduel->game_field->infos.turn_player;
 		if((((reset_flag & RESET_SELF_TURN) && pid == tp) || ((reset_flag & RESET_OPPO_TURN) && pid != tp)) 
 				&& (reset_level & 0x3ff & reset_flag))

libcard.cpp

@@ -1745,6 +1745,7 @@ int32 scriptlib::card_register_flag_effect(lua_State *L) {
 		reset |= (RESET_SELF_TURN | RESET_OPPO_TURN);
 	duel* pduel = pcard->pduel;
 	effect* peffect = pduel->new_effect();
+	peffect->effect_owner = pduel->game_field->core.reason_player;
 	peffect->owner = pcard;
 	peffect->handler = 0;
 	peffect->type = EFFECT_TYPE_SINGLE;