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

Fix so DEV_MODE flag updated appropriately

Browse Source
This commit is contained in:
drdev
2014-05-04 18:27:18 +00:00
parent 9b4af1a58b
commit c2a75f9bce
10 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -34,6 +34,7 @@ import forge.itemmanager.ItemManagerConfig;
import forge.limited.GauntletMini;
import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref;
import forge.quest.QuestController;
import forge.quest.QuestWorld;
import forge.quest.data.QuestPreferences;
@@ -152,6 +153,9 @@ public class FModel {
throw new RuntimeException(exn);
}
ForgePreferences.DEV_MODE = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
ForgePreferences.UPLOAD_DRAFT = ForgePreferences.NET_CONN; // && preferences.getPrefBoolean(FPref.UI_UPLOAD_DRAFT);
formats = new GameFormat.Collection(new GameFormat.Reader(new File(ForgeConstants.BLOCK_DATA_DIR + "formats.txt")));
blocks = new StorageBase<CardBlock>("Block definitions", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "blocks.txt", magicDb.getEditions()));
questPreferences = new QuestPreferences();

7
forge-gui/src/main/java/forge/player/LobbyPlayerHuman.java
View File

@@ -16,7 +16,6 @@ public class LobbyPlayerHuman extends LobbyPlayer implements IGameEntitiesFactor
super(name);
}
@Override
public PlayerController createControllerFor(Player human) {
return new PlayerControllerHuman(human.getGame(), human, this);
@@ -26,10 +25,10 @@ public class LobbyPlayerHuman extends LobbyPlayer implements IGameEntitiesFactor
public Player createIngamePlayer(Game game) {
Player player = new Player(GuiDisplayUtil.personalizeHuman(getName()), game);
player.setFirstController(new PlayerControllerHuman(game, player, this));
if( ForgePreferences.DEV_MODE && FModel.getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND))
player.canCheatPlayUnlimitedLands = true;
if (ForgePreferences.DEV_MODE && FModel.getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND)) {
player.canCheatPlayUnlimitedLands = true;
}
return player;
}