Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

More draft stability (#9718)

Browse source
This commit is contained in:
sprangg 2022-11-25 18:44:14 +02:00 • committed by GitHub
parent 3a036fe52a
commit 0627dc4640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Server/src/main/java/mage/server/draft/DraftSession.java
View file

@ -31,6 +31,7 @@ public class DraftSession {
protected final Draft draft;
protected boolean killed = false;
protected UUID markedCard;
protected int timeoutCardNum; // the pick number for which the current timeout has been set up
private ScheduledFuture<?> futureTimeout;
protected final ScheduledExecutorService timeoutExecutor;
@ -79,6 +80,7 @@ public class DraftSession {
public void pickCard(int timeout) {
if (!killed) {
setupTimeout(timeout);
timeoutCardNum = draft.getCardNum();
managerFactory.userManager()
.getUser(userId)
.ifPresent(user -> user.fireCallback(new ClientCallback(ClientCallbackMethod.DRAFT_PICK, draft.getId(),
@ -91,7 +93,16 @@ public class DraftSession {
cancelTimeout();
if (seconds > 0) {
futureTimeout = timeoutExecutor.schedule(
() -> managerFactory.draftManager().timeout(draft.getId(), userId),
() -> {
try {
if (timeoutCardNum == draft.getCardNum()) {
managerFactory.draftManager().timeout(draft.getId(), userId);
setupTimeout(1); // The timeout keeps happening at a 1 second interval to make sure that the draft moves onto the next pick
}
} catch (Exception e) {
logger.fatal("DraftSession error - userId " + userId + " draftId " + draft.getId(), e);
}
},
seconds, TimeUnit.SECONDS
);
}
@ -113,7 +124,6 @@ public class DraftSession {
}
public DraftPickView sendCardPick(UUID cardId, Set<UUID> hiddenCards) {
cancelTimeout();
if (draft.addPick(playerId, cardId, hiddenCards)) {
return getDraftPickView(0);
}