mirror of https://github.com/FreeCol/freecol.git
Prevent NPE in CargoPanel.
This commit is contained in:
parent
d385568856
commit
bd2576f48c
|
@ -182,7 +182,7 @@ public class CargoPanel extends FreeColPanel
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean accepts(Unit unit) {
|
public boolean accepts(Unit unit) {
|
||||||
return carrier.canAdd(unit);
|
return carrier != null && carrier.canAdd(unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -190,7 +190,7 @@ public class CargoPanel extends FreeColPanel
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean accepts(Goods goods) {
|
public boolean accepts(Goods goods) {
|
||||||
return carrier.canAdd(goods);
|
return carrier != null && carrier.canAdd(goods);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue