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

more defensive null checking in draft panel

Browse source
This commit is contained in:
xenohedron 2023-09-27 23:54:29 -04:00
parent 1c9e954127
commit 7c535658f0
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -122,9 +122,7 @@
}
);
protectionTimer = new Timer(protectionTime, e -> {
protectionTimer.stop();
});
protectionTimer = new Timer(protectionTime, e -> protectionTimer.stop());
}
public void cleanUp() {
@ -337,7 +335,7 @@
if (!draftBooster.isEmptyGrid()) {
SessionHandler.setBoosterLoaded(draftId); // confirm to the server that the booster has been successfully loaded, otherwise the server will re-send the booster
if(pickNo != protectionPickNo && !protectionTimer.isRunning()) {
if (pickNo != protectionPickNo && !protectionTimer.isRunning()) {
// Restart the protection timer.
protectionPickNo = pickNo;
protectionTimer.restart();
@ -451,7 +449,7 @@
// that's why instead of proactively logging our pick we instead
// log *last* pick from the list of picks.
// To make this possible we cache the list of cards from the
// previous booster and it's sequence number (pack number / pick number)
// previous booster and its sequence number (pack number / pick number)
// in fields currentBooster and currentBoosterHeader.
private void logLastPick(DraftPickView pickView) {
if (!isLogging()) {
@ -472,11 +470,13 @@
private String getCurrentSetCode() {
// TODO: Record set codes for random drafts correctly
if (setCodes.size() >= packNo) {
return setCodes.get(packNo - 1);
} else {
return " ";
if (setCodes != null && setCodes.size() >= packNo) {
String setCode = setCodes.get(packNo - 1);
if (setCode != null) { // Not sure how, but got a NPE from this method P1P2 in a ZEN/ZEN/WWK draft
return setCode;
}
}
return " ";
}
private static boolean isLogging() {