Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sends the START_ASSET_TRANSFER_MSG through the same channel as the UPDATE_ASSET_TRANSFER_MSG #3886

Merged
merged 2 commits into from
Mar 29, 2023
Merged

Sends the START_ASSET_TRANSFER_MSG through the same channel as the UPDATE_ASSET_TRANSFER_MSG #3886

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28209e
Sends the `START_ASSET_TRANSFER_MSG` through the same channel as the …
emmebi Mar 28, 2023
7c70e75
Merge branch 'develop' into issue-3853-download-stuck
cwisniew Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/net/rptools/maptool/server/ServerMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import static net.rptools.maptool.server.proto.Message.MessageTypeCase.HEARTBEAT_MSG;

import java.awt.geom.Area;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import net.rptools.clientserver.simple.MessageHandler;
import net.rptools.lib.MD5Key;
Expand All @@ -26,6 +28,7 @@
import net.rptools.maptool.client.ServerCommandClientImpl;
import net.rptools.maptool.client.ui.zone.FogUtil;
import net.rptools.maptool.client.ui.zone.ZoneRenderer;
import net.rptools.maptool.common.MapToolConstants;
import net.rptools.maptool.events.MapToolEventBus;
import net.rptools.maptool.model.*;
import net.rptools.maptool.model.InitiativeList.TokenInitiative;
Expand Down Expand Up @@ -623,7 +626,10 @@ private void getAsset(String id, MD5Key assetID) {
var msg = StartAssetTransferMsg.newBuilder().setHeader(producer.getHeader().toDto());
server
.getConnection()
.sendMessage(id, Message.newBuilder().setStartAssetTransferMsg(msg).build());
.sendMessage(
id,
MapToolConstants.Channel.IMAGE,
Message.newBuilder().setStartAssetTransferMsg(msg).build());
server.addAssetProducer(id, producer);

} catch (IllegalArgumentException iae) {
Expand Down