- 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).

This commit is contained in:
Agetian
2017-05-11 17:26:46 +00:00
parent 1cf3d9c975
commit 3ee044c254

View File

@@ -303,7 +303,9 @@ 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());
playerPanel.setSelectedTab((InfoTab)player.getValue()); if (player.getValue() == null || player.getValue() instanceof InfoTab) {
playerPanel.setSelectedTab((InfoTab) player.getValue());
}
} }
} }