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

removed global calls to getPlayer (for human player at gui) where member/local variables could provide data needed

Browse Source
This commit is contained in:
Maxmtg
2013-05-22 21:40:11 +00:00
parent 58aa4aef55
commit c0b8c4cf21
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/control/input/InputBlock.java
View File

@@ -105,7 +105,7 @@ public class InputBlock extends InputBase {
if (isMetaDown) {
if (card.getController() == Singletons.getControl().getPlayer() ) {
if (card.getController() == player ) {
game.getCombat().removeFromCombat(card);
}
removeFromAllBlocking(card);

3
src/main/java/forge/control/input/InputCleanup.java
View File

@@ -73,8 +73,7 @@ public class InputCleanup extends InputBase {
/** {@inheritDoc} */
@Override
public final void selectCard(final Card card, boolean isMetaDown) {
Zone zone = game.getZoneOf(card);
if (!zone.is(ZoneType.Hand, Singletons.getControl().getPlayer()))
if (!player.getZone(ZoneType.Hand).contains(card))
return;
game.getInputQueue().LockAndInvokeGameAction(new Runnable() {

3
src/main/java/forge/game/MatchController.java
View File

@@ -20,6 +20,7 @@ import forge.game.player.LobbyPlayer;
import forge.game.player.LobbyPlayerHuman;
import forge.game.player.Player;
import forge.game.player.PlayerStatistics;
import forge.game.player.PlayerType;
import forge.gui.GuiDialog;
import forge.gui.framework.EDocID;
import forge.gui.framework.SDisplayUtil;
@@ -374,7 +375,7 @@ public class MatchController {
}
boolean willPlay = goesFirst.getController().getWillPlayOnFirstTurn(message);
if ( goesFirst != FControl.SINGLETON_INSTANCE.getPlayer() ) {
if ( goesFirst.getLobbyPlayer().getType() == PlayerType.COMPUTER ) {
GuiDialog.message(message + "\nComputer Going First");
}
goesFirst = willPlay ? goesFirst : goesFirst.getOpponent();

2
src/main/java/forge/game/phase/CombatUtil.java
View File

@@ -387,7 +387,7 @@ public class CombatUtil {
*/
public static boolean finishedMandatoryBlocks(final Combat combat, final Player defending) {
final List<Card> blockers = Singletons.getControl().getPlayer().getCreaturesInPlay();
final List<Card> blockers = defending.getCreaturesInPlay();
final List<Card> attackers = combat.getAttackers();
// if a creature does not block but should, return false

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

@@ -1811,7 +1811,7 @@ public class Player extends GameEntity implements Comparable<Player> {
}
// Dev Mode
if (this == FControl.SINGLETON_INSTANCE.getPlayer() && Preferences.DEV_MODE &&
if (this.getLobbyPlayer().getType() == PlayerType.HUMAN && Preferences.DEV_MODE &&
Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND)) {
return true;
}

15
src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -120,8 +120,7 @@ public final class GuiDisplayUtil {
public static void devModeGenerateMana() {
final Card dummy = new Card();
final Player human = Singletons.getControl().getPlayer();
dummy.setOwner(human);
dummy.setOwner(getPlayer());
Map<String, String> produced = new HashMap<String, String>();
produced.put("Produced", "W W W W W W W U U U U U U U B B B B B B B G G G G G G G R R R R R R R 7");
final AbilityManaPart abMana = new AbilityManaPart(dummy, produced);
@@ -287,7 +286,7 @@ public final class GuiDisplayUtil {
List<Card> humanDevExileSetup = new ArrayList<Card>();
List<Card> computerDevExileSetup = new ArrayList<Card>();
final Player human = Singletons.getControl().getPlayer();
final Player human = getPlayer();
final Player ai = human.getOpponents().get(0);
if (!tChangePlayer.trim().toLowerCase().equals("none")) {
@@ -455,7 +454,7 @@ public final class GuiDisplayUtil {
* @since 1.0.15
*/
public static void devModeTutor() {
final List<Card> lib = Singletons.getControl().getPlayer().getCardsIn(ZoneType.Library);
final List<Card> lib = getPlayer().getCardsIn(ZoneType.Library);
final Object o = GuiChoose.oneOrNone("Choose a card", lib);
if (null == o) {
return;
@@ -540,7 +539,7 @@ public final class GuiDisplayUtil {
* @since 1.0.16
*/
public static void devModeUnlimitedLand() {
Singletons.getControl().getPlayer().addMaxLandsToPlay(100);
getPlayer().addMaxLandsToPlay(100);
}
/**
@@ -637,7 +636,7 @@ public final class GuiDisplayUtil {
game.getAction().moveToHand(forgeCard); // this is really needed (for rollbacks at least)
// Human player is choosing targets for an ability controlled by chosen player.
sa.setActivatingPlayer(p);
HumanPlay.playSaWithoutPayingManaCost(Singletons.getControl().getPlayer(), sa);
HumanPlay.playSaWithoutPayingManaCost(getPlayer(), sa);
}
});
}
@@ -705,5 +704,9 @@ public final class GuiDisplayUtil {
private static GameState getGame() {
return Singletons.getControl().getMatch().getCurrentGame();
}
private static Player getPlayer() {
return Singletons.getControl().getPlayer();
}
} // end class GuiDisplayUtil