fix

libduel.cpp

@@ -2010,6 +2010,12 @@ int32 scriptlib::duel_get_mzone_count(lua_State *L) {
 		zone = (uint32)lua_tointeger(L, 5);
 	uint32 list = 0;
 	auto count = pduel->game_field->get_useable_count(nullptr, playerid, LOCATION_MZONE, uplayer, reason, zone, &list);
+	if(swapped) {
+		pduel->game_field->player[0].used_location = used_location[0];
+		pduel->game_field->player[1].used_location = used_location[1];
+		pduel->game_field->player[0].list_mzone.swap(list_mzone[0]);
+		pduel->game_field->player[1].list_mzone.swap(list_mzone[1]);
+	}
 	if(uplayer == playerid && reason == LOCATION_REASON_TOFIELD) {
 		int32 kaiser_limit = 0xff;
 		if(mcard) {
@@ -2022,12 +2028,6 @@ int32 scriptlib::duel_get_mzone_count(lua_State *L) {
 	}
 	lua_pushinteger(L, count);
 	lua_pushinteger(L, list);
-	if(swapped) {
-		pduel->game_field->player[0].used_location = used_location[0];
-		pduel->game_field->player[1].used_location = used_location[1];
-		pduel->game_field->player[0].list_mzone.swap(list_mzone[0]);
-		pduel->game_field->player[1].list_mzone.swap(list_mzone[1]);
-	}
 	return 2;
 }
 // Condition: uplayer moves scard or any card with type from Extra Deck to playerid's field
@@ -2091,6 +2091,12 @@ int32 scriptlib::duel_get_location_count_fromex(lua_State *L) {
 		zone = (uint32)lua_tointeger(L, 5);
 	uint32 list = 0;
 	auto count = pduel->game_field->get_useable_count_fromex(scard, playerid, uplayer, zone, &list);
+	if(swapped) {
+		pduel->game_field->player[0].used_location = used_location[0];
+		pduel->game_field->player[1].used_location = used_location[1];
+		pduel->game_field->player[0].list_mzone.swap(list_mzone[0]);
+		pduel->game_field->player[1].list_mzone.swap(list_mzone[1]);
+	}
 	if(uplayer == playerid) {
 		int32 kaiser_limit = 0xff;
 		if(mcard) {
@@ -2103,12 +2109,6 @@ int32 scriptlib::duel_get_location_count_fromex(lua_State *L) {
 	}
 	lua_pushinteger(L, count);
 	lua_pushinteger(L, list);
-	if(swapped) {
-		pduel->game_field->player[0].used_location = used_location[0];
-		pduel->game_field->player[1].used_location = used_location[1];
-		pduel->game_field->player[0].list_mzone.swap(list_mzone[0]);
-		pduel->game_field->player[1].list_mzone.swap(list_mzone[1]);
-	}
 	if(use_temp_card) {
 		scard->current.location = 0;
 		scard->data.type = 0;