From 2b0638f54fcff5385c0b876e2ef4ada17e19c5a9 Mon Sep 17 00:00:00 2001 From: drtshock Date: Thu, 7 May 2015 10:39:04 -0500 Subject: [PATCH] Pull out null check because console can have null faction. Fixes #375. --- src/main/java/com/massivecraft/factions/cmd/CmdShow.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java index 583d3cf3..191e06d0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java @@ -38,9 +38,10 @@ public class CmdShow extends FCommand { Faction faction = myFaction; if (this.argIsSet(0)) { faction = this.argAsFaction(0); - if (faction == null) { - return; - } + } + + if (faction == null) { + return; } // if economy is enabled, they're not on the bypass list, and this