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

Wait 2 seconds before making the draft pick for a timed out player (#10733)

Browse source 
* The draft session waits for 5 seconds before making the pick for the timed out player

* Formatting

* Renamed constant

* Tweak

* If the draft pick's timeout value would increase the client's pick's timer, don't set it (might happen if the client or server is lagging)

* Lowered BOOSTER_LOADING_INTERVAL and AUTOPICK_BUFFER

---------

Co-authored-by: sprangg <a@b.c>
This commit is contained in:
sprangg 2023-08-07 03:00:42 +03:00 • committed by GitHub
parent 456ea87107
commit 287df7af21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,10 @@ 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
protected int timeoutCounter = 0; // increments every second that the player has run out of picking time
protected final int AUTOPICK_BUFFER = 2; // seconds - when the player has run out of picking time, the autopick happens after this many seconds (to account for client timer possibly lagging behind server)
private ScheduledFuture<?> futureTimeout;
protected final ScheduledExecutorService timeoutExecutor;
@ -92,11 +95,16 @@ public class DraftSession {
private synchronized void setupTimeout(int seconds) {
cancelTimeout();
if (seconds > 0) {
if (seconds > 1 ) {
timeoutCounter = 0;
}
futureTimeout = timeoutExecutor.schedule(
() -> {
try {
if (timeoutCardNum == draft.getCardNum()) {
managerFactory.draftManager().timeout(draft.getId(), userId);
if (timeoutCounter++ > AUTOPICK_BUFFER) { // the autopick happens after n seconds (to account for client timer possibly lagging behind server)
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) {