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

NPE evade. Fixes #712.

Browse Source
This commit is contained in:
Olof Larsson 2014-11-26 15:01:12 +01:00
parent 446ba5c74c
commit a70ee689c6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/massivecraft/factions/engine/EngineMain.java
View File

@ -1019,7 +1019,8 @@ public class EngineMain extends EngineAbstract
// ... if there is a faction at the players location ... // ... if there is a faction at the players location ...
PS ps = PS.valueOf(player.getLocation()).getChunk(true); PS ps = PS.valueOf(player.getLocation()).getChunk(true);
Faction factionAtPs = BoardColl.get().getFactionAt(ps); Faction factionAtPs = BoardColl.get().getFactionAt(ps);
if (factionAtPs.isNone()) return; // TODO: An NPE can arise here? Why? if (factionAtPs == null) return;
if (factionAtPs.isNone()) return;
// ... the command may be denied in the territory of this relation type ... // ... the command may be denied in the territory of this relation type ...
Rel rel = factionAtPs.getRelationTo(mplayer); Rel rel = factionAtPs.getRelationTo(mplayer);