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

Prevent mobile app crashing on startup

Browse Source
This commit is contained in:
drdev
2015-01-16 03:58:13 +00:00
parent 47a3a173b6
commit 72a33daf87
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -2212,12 +2212,16 @@ public class Player extends GameEntity implements Comparable<Player> {
} }
controllerCreator = ctrlr; controllerCreator = ctrlr;
controller = ctrlr; controller = ctrlr;
view.updateAvatarIndex(this); updateAvatar();
view.updateAvatarCardImageKey(this);
view.updateIsAI(this); view.updateIsAI(this);
view.updateLobbyPlayerName(this); view.updateLobbyPlayerName(this);
} }
public void updateAvatar() {
view.updateAvatarIndex(this);
view.updateAvatarCardImageKey(this);
}
/** /**
* Run a procedure using a different controller * Run a procedure using a different controller
*/ */

4
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -7,8 +7,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.LobbyPlayer; import forge.LobbyPlayer;
@@ -61,7 +61,7 @@ public class MatchController implements IMatchController {
String lp = p.getLobbyPlayerName(); String lp = p.getLobbyPlayerName();
FImage avatar = avatarImages.get(lp); FImage avatar = avatarImages.get(lp);
if (avatar == null) { if (avatar == null) {
if (p.getAvatarCardImageKey() == null) { if (StringUtils.isEmpty(p.getAvatarCardImageKey())) {
avatar = new FTextureRegionImage(FSkin.getAvatars().get(p.getAvatarIndex())); avatar = new FTextureRegionImage(FSkin.getAvatars().get(p.getAvatarIndex()));
} }
else { //handle lobby players with art from cards else { //handle lobby players with art from cards

1
forge-gui/src/main/java/forge/match/MatchUtil.java
View File

@@ -147,6 +147,7 @@ public class MatchUtil {
i++; i++;
} }
p.getLobbyPlayer().setAvatarIndex(avatarIndex); p.getLobbyPlayer().setAvatarIndex(avatarIndex);
p.updateAvatar();
if (p.getController() instanceof PlayerControllerHuman) { if (p.getController() instanceof PlayerControllerHuman) {
final PlayerControllerHuman humanController = (PlayerControllerHuman) p.getController(); final PlayerControllerHuman humanController = (PlayerControllerHuman) p.getController();