diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 79f167711c9..0c56efb0729 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -1824,6 +1824,9 @@ public class Player extends GameEntity implements Comparable { } } } + + if( land.getOwner() != this ) + return false; // Dev Mode if (this.getLobbyPlayer().getType() == PlayerType.HUMAN && Preferences.DEV_MODE && diff --git a/src/main/java/forge/gui/match/controllers/CDock.java b/src/main/java/forge/gui/match/controllers/CDock.java index f052317309a..ff90fd36dc1 100644 --- a/src/main/java/forge/gui/match/controllers/CDock.java +++ b/src/main/java/forge/gui/match/controllers/CDock.java @@ -67,7 +67,6 @@ public enum CDock implements ICDoc { private LobbyPlayer player; public void setModel(GameState game0, LobbyPlayer player0) { - game = game0; player = player0; } @@ -75,7 +74,8 @@ public enum CDock implements ICDoc { private Player findAffectedPlayer() { // try current priority Player currentPriority = game.getPhaseHandler().getPriorityPlayer(); - if( currentPriority.getLobbyPlayer() == player ) return currentPriority; + if( currentPriority.getLobbyPlayer() == player ) + return currentPriority; // otherwise find just any player, belonging to this lobbyplayer for(Player p : game.getPlayers())