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

Improved network stability and other related fixes:

Browse source 
* server: fixed that a critical errors ignored in user commands threads (now it will be added to the logs);
* network: fixed frozen user responses in some use cases;
* network: fixed accidental and incorrect user responses (only latest response will be used now);
* network: improved freeze logs, added problem method name and code's line number;
* cheats: removed outdated deck and card load logic (only init.txt commands supports now);
* cheats: fixed wrong priority after add card dialog (closes #11437);
* cheats: improved stability and random errors on cheat executes (related to #11437);
* docs: added details on network and thread logic, human feedback life cycle, etc (see HumanPlayer, ThreadExecutorImpl);
This commit is contained in:
Oleg Agafonov 2023-11-24 21:22:16 +04:00
parent 4ba3e1fec5
commit 53add71826
33 changed files with 476 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -27,7 +27,6 @@ import mage.server.Main;
import mage.server.User;
import mage.server.managers.ManagerFactory;
import mage.server.util.Splitter;
import mage.server.util.SystemUtil;
import mage.util.MultiAmountMessage;
import mage.utils.StreamUtils;
import mage.utils.timer.PriorityTimer;
@ -502,6 +501,10 @@ public class GameController implements GameCallback {
}
public void sendPlayerAction(PlayerAction playerAction, UUID userId, Object data) {
// TODO: critical bug, must be enabled and research/rework due:
// * game change commands must be executed by game thread (example: undo)
// * user change commands can be executed by network thread??? (example: change skip settings)
//SystemUtil.ensureRunInGameThread();
switch (playerAction) {
case UNDO:
game.undo(getPlayerId(userId));
@ -705,31 +708,10 @@ public class GameController implements GameCallback {
}
}
public void cheat(UUID userId, UUID playerId, DeckCardLists deckList) {
try {
Deck deck = Deck.load(deckList, false, false);
game.loadCards(deck.getCards(), playerId);
for (Card card : deck.getCards()) {
card.putOntoBattlefield(game, Zone.OUTSIDE, null, playerId);
}
} catch (GameException ex) {
logger.warn(ex.getMessage());
}
addCardsForTesting(game, playerId);
updateGame();
}
public boolean cheat(UUID userId, UUID playerId, String cardName) {
CardInfo cardInfo = CardRepository.instance.findCard(cardName);
Card card = cardInfo != null ? cardInfo.getCard() : null;
if (card != null) {
Set<Card> cards = new HashSet<>();
cards.add(card);
game.loadCards(cards, playerId);
card.moveToZone(Zone.HAND, null, game, false);
return true;
} else {
return false;
public void cheatShow(UUID playerId) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.signalPlayerCheat();
}
}
@ -985,13 +967,6 @@ public class GameController implements GameCallback {
return false;
}
/**
* Adds cards in player's hands that are specified in config/init.txt.
*/
private void addCardsForTesting(Game game, UUID playerId) {
SystemUtil.addCardsForTesting(game, null, game.getPlayer(playerId));
}
/**
* Performs a request to a player
*