Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid NPE

Browse Source
This commit is contained in:
Magnus Ulf 2019-02-09 16:57:05 +01:00
parent d6ec4ad5f0
commit 38a0b93cc3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/massivecraft/factions/cmd/type/TypeFaction.java
View File

@ -66,10 +66,13 @@ public class TypeFaction extends TypeAbstract<Faction>
// MPlayer Name Exact // MPlayer Name Exact
String id = IdUtil.getId(str); String id = IdUtil.getId(str);
MPlayer mplayer = MPlayerColl.get().get(id, false); if (id != null)
if (mplayer != null)
{ {
return mplayer.getFaction(); MPlayer mplayer = MPlayerColl.get().get(id, false);
if (mplayer != null)
{
return mplayer.getFaction();
}
} }
throw new MassiveException().addMsg("<b>No faction or player matching \"<p>%s<b>\".", str); throw new MassiveException().addMsg("<b>No faction or player matching \"<p>%s<b>\".", str);