From 66a7685bf7e5b2b58b193b5bd7d7140510094e3a Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Thu, 26 Apr 2012 08:08:10 -0500
Subject: [PATCH] /f show|who command will no longer reveal players as online
 if they are hidden from the viewer by the Vanish API

---
 src/com/massivecraft/factions/cmd/CmdShow.java           | 6 +++---
 .../factions/zcore/persist/PlayerEntity.java             | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdShow.java b/src/com/massivecraft/factions/cmd/CmdShow.java
index 7799e074..d96cbcad 100644
--- a/src/com/massivecraft/factions/cmd/CmdShow.java
+++ b/src/com/massivecraft/factions/cmd/CmdShow.java
@@ -128,7 +128,7 @@ public class CmdShow extends FCommand
 		for (FPlayer follower : admins)
 		{
 			listpart = follower.getNameAndTitle(fme)+p.txt.parse("<i>")+", ";
-			if (follower.isOnline())
+			if (follower.isOnlineAndVisibleTo(me))
 			{
 				onlineList += listpart;
 			}
@@ -141,7 +141,7 @@ public class CmdShow extends FCommand
 		{
 			listpart = follower.getNameAndTitle(fme)+p.txt.parse("<i>")+", ";
 			if
-			(follower.isOnline())
+			(follower.isOnlineAndVisibleTo(me))
 			{
 				onlineList += listpart;
 			} else {
@@ -150,7 +150,7 @@ public class CmdShow extends FCommand
 		}
 		for (FPlayer follower : normals) {
 			listpart = follower.getNameAndTitle(fme)+p.txt.parse("<i>")+", ";
-			if (follower.isOnline()) {
+			if (follower.isOnlineAndVisibleTo(me)) {
 				onlineList += listpart;
 			} else {
 				offlineList += listpart;
diff --git a/src/com/massivecraft/factions/zcore/persist/PlayerEntity.java b/src/com/massivecraft/factions/zcore/persist/PlayerEntity.java
index f8ccced9..bbe9491f 100644
--- a/src/com/massivecraft/factions/zcore/persist/PlayerEntity.java
+++ b/src/com/massivecraft/factions/zcore/persist/PlayerEntity.java
@@ -16,7 +16,14 @@ public class PlayerEntity extends Entity
 	{
 		return this.getPlayer() != null;
 	}
-	
+
+	// make sure target player should be able to detect that this player is online
+	public boolean isOnlineAndVisibleTo(Player player)
+	{
+		Player target = this.getPlayer();
+		return target != null && player.canSee(target);
+	}
+
 	public boolean isOffline()
 	{
 		return ! isOnline();