Null check when sending scoreboard. Resolves #328.

This commit is contained in:
drtshock 2015-03-18 08:29:36 -05:00
parent cd38fb40b6
commit ced36df08f

View File

@ -581,7 +581,7 @@ public abstract class MemoryFPlayer implements FPlayer {
* @return true if should show, otherwise false.
*/
public boolean shouldShowScoreboard(Faction toShow) {
return !toShow.isWarZone() && !toShow.isNone() && !toShow.isSafeZone() && P.p.getConfig().contains("scoreboard.finfo") && P.p.getConfig().getBoolean("scoreboard.finfo-enabled", false) && P.p.cmdBase.cmdSB.showBoard(this);
return !toShow.isWarZone() && !toShow.isNone() && !toShow.isSafeZone() && P.p.getConfig().contains("scoreboard.finfo") && P.p.getConfig().getBoolean("scoreboard.finfo-enabled", false) && P.p.cmdBase.cmdSB.showBoard(this) && FScoreboard.get(this) != null;
}
// -------------------------------