Merge with master

2011-10-23 20:53:56 +02:00
parent 98c5230655 136b69b07f
commit ac6870b770
18 changed files with 114 additions and 7 deletions
--- a/src/com/massivecraft/factions/integration/SpoutFeatures.java
+++ b/src/com/massivecraft/factions/integration/SpoutFeatures.java
@ -220,6 +220,9 @@ public class SpoutFeatures

 		SpoutPlayer sPlayer = SpoutManager.getPlayer(viewer.getPlayer());
 		Player pViewed = viewed.getPlayer();
+		if (pViewed == null || viewer.getPlayer() == null)
+			return;
+
 		String viewedTitle = viewed.getTitle();
 		Rel viewedRole = viewed.getRole();