From cea9a85f2b61de5e54b6681347653b76274ae6db Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Mon, 29 Apr 2013 10:35:35 +0200
Subject: [PATCH] Fix an nPE

---
 src/com/massivecraft/factions/entity/Board.java  | 2 +-
 src/com/massivecraft/factions/entity/XColls.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/massivecraft/factions/entity/Board.java b/src/com/massivecraft/factions/entity/Board.java
index 7bf76b77..980d466c 100644
--- a/src/com/massivecraft/factions/entity/Board.java
+++ b/src/com/massivecraft/factions/entity/Board.java
@@ -99,7 +99,7 @@ public class Board extends Entity<Board> implements BoardInterface
 	{
 		if (ps == null) return null;
 		TerritoryAccess ta = this.getTerritoryAccessAt(ps);
-		return ta.getHostFaction(ps);
+		return ta.getHostFaction(this);
 	}
 	
 	// SET
diff --git a/src/com/massivecraft/factions/entity/XColls.java b/src/com/massivecraft/factions/entity/XColls.java
index 4a502ff5..1aaf486a 100644
--- a/src/com/massivecraft/factions/entity/XColls.java
+++ b/src/com/massivecraft/factions/entity/XColls.java
@@ -27,7 +27,6 @@ public abstract class XColls<C extends Coll<E>, E> extends Colls<C, E>
 			String universe = ((Coll<?>)o).getUniverse();
 			if (universe == null) return null;
 			return this.getForUniverse(universe);
-
 		}
 		
 		if (SenderUtil.isNonplayer(o))