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

Fix an nPE

Browse Source
This commit is contained in:
Olof Larsson 2013-04-29 10:35:35 +02:00
parent 1d951fb5cf
commit cea9a85f2b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/entity/Board.java
View File

@ -99,7 +99,7 @@ public class Board extends Entity<Board> implements BoardInterface
{ {
if (ps == null) return null; if (ps == null) return null;
TerritoryAccess ta = this.getTerritoryAccessAt(ps); TerritoryAccess ta = this.getTerritoryAccessAt(ps);
return ta.getHostFaction(ps); return ta.getHostFaction(this);
} }
// SET // SET

1
src/com/massivecraft/factions/entity/XColls.java
View File

@ -27,7 +27,6 @@ public abstract class XColls<C extends Coll<E>, E> extends Colls<C, E>
String universe = ((Coll<?>)o).getUniverse(); String universe = ((Coll<?>)o).getUniverse();
if (universe == null) return null; if (universe == null) return null;
return this.getForUniverse(universe); return this.getForUniverse(universe);
} }
if (SenderUtil.isNonplayer(o)) if (SenderUtil.isNonplayer(o))