From ec297c243cb2c562b2d966cbd450c92bc265b919 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Tue, 22 Nov 2011 10:59:53 -0500 Subject: [PATCH] fixed shuffle event --- .../mage/player/ai/ComputerPlayerMCTS.java | 5 +++-- Mage.Server/plugins/mage-player-aimcts.jar | Bin 22793 -> 22510 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java index c4edc387267..f2599117912 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java @@ -72,6 +72,8 @@ public class ComputerPlayerMCTS extends ComputerPlayer imple public void priority(Game game) { getNextAction(game); Ability ability = root.getAction(); + if (ability == null) + logger.fatal("null ability"); activateAbility((ActivatedAbility)ability, game); } @@ -292,8 +294,7 @@ public class ComputerPlayerMCTS extends ComputerPlayer imple Player origPlayer = game.getState().getPlayers().get(copyPlayer.getId()); MCTSPlayer newPlayer = new MCTSPlayer(copyPlayer.getId()); newPlayer.restore(origPlayer); - //FIXME: this shuffling causes event to trigger that is not correct - newPlayer.shuffleLibrary(mcts); + newPlayer.getLibrary().shuffle(); mcts.getState().getPlayers().put(copyPlayer.getId(), newPlayer); } mcts.setSimulation(true); diff --git a/Mage.Server/plugins/mage-player-aimcts.jar b/Mage.Server/plugins/mage-player-aimcts.jar index 6d732f5da10c9f476b67c3caf294c82e0051e168..7e274e6e37850231350bcd6594834cddbd3836e2 100644 GIT binary patch delta 4980 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 Zzdc0bIS%fhkGpr%Yp?+T4(&g){{yL%Ggtrs delta 5250 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