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

- Ensure that restoreOldZones in Mobile Forge only accepts correct objects when processing player InfoTabs (otherwise the game may crash or hang under certain circumstances when an unexpectedly filled Object set is passed in VStack).

Browse Source
This commit is contained in:
Agetian
2017-05-11 17:26:46 +00:00
parent 1cf3d9c975
commit 3ee044c254
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,9 +303,11 @@ public class MatchController extends AbstractGuiGame {
public void restoreOldZones(final Map<PlayerView, Object> playersToRestoreZonesFor) { public void restoreOldZones(final Map<PlayerView, Object> playersToRestoreZonesFor) {
for (final Entry<PlayerView, Object> player : playersToRestoreZonesFor.entrySet()) { for (final Entry<PlayerView, Object> player : playersToRestoreZonesFor.entrySet()) {
final VPlayerPanel playerPanel = view.getPlayerPanel(player.getKey()); final VPlayerPanel playerPanel = view.getPlayerPanel(player.getKey());
if (player.getValue() == null || player.getValue() instanceof InfoTab) {
playerPanel.setSelectedTab((InfoTab) player.getValue()); playerPanel.setSelectedTab((InfoTab) player.getValue());
} }
} }
}
@Override @Override
public Map<CardView, Integer> assignDamage(final CardView attacker, final List<CardView> blockers, final int damage, final GameEntityView defender, final boolean overrideOrder) { public Map<CardView, Integer> assignDamage(final CardView attacker, final List<CardView> blockers, final int damage, final GameEntityView defender, final boolean overrideOrder) {