external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Players cannot play lands they don't own (useful for hotseat mode)

Browse Source
This commit is contained in:
Maxmtg
2013-05-25 16:58:19 +00:00
parent e8aefbcd4e
commit 4b05e27e77
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/game/player/Player.java
View File

@@ -1825,6 +1825,9 @@ public class Player extends GameEntity implements Comparable<Player> {
} }
} }
if( land.getOwner() != this )
return false;
// Dev Mode // Dev Mode
if (this.getLobbyPlayer().getType() == PlayerType.HUMAN && Preferences.DEV_MODE && if (this.getLobbyPlayer().getType() == PlayerType.HUMAN && Preferences.DEV_MODE &&
Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND)) { Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND)) {

4
src/main/java/forge/gui/match/controllers/CDock.java
View File

@@ -67,7 +67,6 @@ public enum CDock implements ICDoc {
private LobbyPlayer player; private LobbyPlayer player;
public void setModel(GameState game0, LobbyPlayer player0) { public void setModel(GameState game0, LobbyPlayer player0) {
game = game0; game = game0;
player = player0; player = player0;
} }
@@ -75,7 +74,8 @@ public enum CDock implements ICDoc {
private Player findAffectedPlayer() { private Player findAffectedPlayer() {
// try current priority // try current priority
Player currentPriority = game.getPhaseHandler().getPriorityPlayer(); 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 // otherwise find just any player, belonging to this lobbyplayer
for(Player p : game.getPlayers()) for(Player p : game.getPlayers())