External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: fixed error on load tests end (related to #11572), improved logs, improved session lifecycle on load tests;

Browse source 
tests: added additional test for Mana Maze and deep copy (related to #11572);
docs: added more info to network related code;
This commit is contained in:
Oleg Agafonov 2024-01-08 04:03:16 +04:00
parent 98a3d8b947
commit b3c55555a1
12 changed files with 119 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -3973,10 +3973,11 @@ public abstract class GameImpl implements Game {
Player activePayer = this.getPlayer(this.getActivePlayerId());
StringBuilder sb = new StringBuilder()
.append(this.isSimulation() ? "!!!SIMULATION!!! " : "")
.append(this.getGameType().toString())
.append("; ").append(this.getGameType().toString())
.append("; ").append(CardUtil.getTurnInfo(this))
.append("; active: ").append((activePayer == null ? "none" : activePayer.getName()))
.append("; stack: ").append(this.getStack().toString());
.append("; stack: ").append(this.getStack().toString())
.append(this.getState().isGameOver() ? "; FINISHED: " + this.getWinner() : "");
return sb.toString();
}
}

13
Mage/src/main/java/mage/game/match/MatchOptions.java
View file

@ -1,4 +1,3 @@
package mage.game.match;
import mage.cards.decks.DeckCardInfo;
@ -20,8 +19,8 @@ import java.util.*;
public class MatchOptions implements Serializable {
protected String name;
protected MultiplayerAttackOption attackOption;
protected RangeOfInfluence range;
protected MultiplayerAttackOption attackOption = MultiplayerAttackOption.LEFT;
protected RangeOfInfluence range = RangeOfInfluence.ALL;
protected int winsNeeded;
protected int freeMulligans;
protected boolean customStartLifeEnabled;
@ -35,7 +34,7 @@ public class MatchOptions implements Serializable {
protected boolean multiPlayer;
protected int numSeats;
protected String password;
protected SkillLevel skillLevel;
protected SkillLevel skillLevel = SkillLevel.CASUAL;
protected boolean rollbackTurnsAllowed;
protected boolean spectatorsAllowed;
protected boolean planeChase;
@ -49,8 +48,8 @@ public class MatchOptions implements Serializable {
protected MatchBufferTime matchBufferTime = MatchBufferTime.NONE; // additional/buffer time limit for each priority before real time ticking starts
protected MulliganType mulliganType = MulliganType.GAME_DEFAULT;
protected Collection<DeckCardInfo> perPlayerEmblemCards;
protected Collection<DeckCardInfo> globalEmblemCards;
protected Collection<DeckCardInfo> perPlayerEmblemCards = Collections.emptySet();
protected Collection<DeckCardInfo> globalEmblemCards = Collections.emptySet();
public MatchOptions(String name, String gameType, boolean multiPlayer, int numSeats) {
this.name = name;
@ -58,8 +57,6 @@ public class MatchOptions implements Serializable {
this.password = "";
this.multiPlayer = multiPlayer;
this.numSeats = numSeats;
this.perPlayerEmblemCards = Collections.emptySet();
this.globalEmblemCards = Collections.emptySet();
}
public void setNumSeats(int numSeats) {