mirror of https://github.com/FreeCol/freecol.git
Catch NPE from broken Region earlier to prevent game freeze, BR#2885
This commit is contained in:
parent
5ca144f438
commit
0129a9065d
|
@ -47,6 +47,7 @@ import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
|
@ -1904,7 +1905,11 @@ public final class MapViewer {
|
||||||
&& tile.getRegion().getName() == null) {
|
&& tile.getRegion().getName() == null) {
|
||||||
text = tile.getRegion().getSuffix();
|
text = tile.getRegion().getSuffix();
|
||||||
} else {
|
} else {
|
||||||
text = Messages.message(tile.getRegion().getLabel());
|
try {
|
||||||
|
text = Messages.message(tile.getRegion().getLabel());
|
||||||
|
} catch(NullPointerException e) {
|
||||||
|
logger.log(Level.WARNING, "Uninitialized Region"/*, e*/);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
displayTerritorialBorders(g, tile, BorderType.REGION, true);
|
displayTerritorialBorders(g, tile, BorderType.REGION, true);
|
||||||
|
|
Loading…
Reference in New Issue