Fix Mindslaver so you can actually take actions for your opponent

This commit is contained in:
drdev
2014-10-15 15:33:47 +00:00
parent 4f3bf5d6fa
commit ab7fb0788e
6 changed files with 52 additions and 45 deletions

View File

@@ -2,8 +2,7 @@ package forge.game.player;
import forge.game.Game;
public interface IGameEntitiesFactory
{
PlayerController createControllerFor(Player p);
public interface IGameEntitiesFactory {
PlayerController createMindSlaveController(Player master, Player slave);
Player createIngamePlayer(Game game, int id);
}

View File

@@ -2085,7 +2085,7 @@ public class Player extends GameEntity implements Comparable<Player> {
if (mindSlaveMaster != null) {
LobbyPlayer oldLobbyPlayer = getLobbyPlayer();
IGameEntitiesFactory master = (IGameEntitiesFactory)mindSlaveMaster.getLobbyPlayer();
controller = master.createControllerFor(this);
controller = master.createMindSlaveController(mindSlaveMaster, this);
game.fireEvent(new GameEventPlayerControl(this, oldLobbyPlayer, getLobbyPlayer()));
}
else {