show hidden players in /who list to ops

mixxit · Aug 28, 2019 · 5fbb89d · 5fbb89d
1 parent fbe35b7
commit 5fbb89d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ local.properties
 .buildpath
 .target
 .texlipse
+server/
 
 # Java files
 *.class

diff --git a/src/com/solinia/solinia/Commands/CommandWho.java b/src/com/solinia/solinia/Commands/CommandWho.java
@@ -33,11 +33,23 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
 	        for(Player currentplayer : Bukkit.getServer().getOnlinePlayers())
 		    {
+	        	String hidden = "";
+
 	        	if (currentplayer.hasPermission("essentials.silentjoin"))
+	        		hidden = "[HIDDEN]";
+
+	        	if (currentplayer.hasPermission("essentials.silentjoin") && !sender.isOp())
+	        	{
 	        		continue;
+	        	}
 
 	        	if (!player.canSee(currentplayer))
+	        		hidden = "[HIDDEN]";
+
+	        	if (!player.canSee(currentplayer) && !sender.isOp())
+	        	{
 	        		continue;
+	        	}
 
 	        	if (!filter.equals(""))
 	        		if (!currentplayer.getDisplayName().contains(filter))
@@ -62,7 +74,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 		        		continue;
 		        	}
 
-		        	TextComponent tc = new TextComponent(TextComponent.fromLegacyText("["+currentplayer.getName()+"]"+ChatColor.YELLOW + solplayer.getFullName().toUpperCase() + ChatColor.RESET + " ["+ currentplayer.getWorld().getName() +"] - LVL " + ChatColor.AQUA + lvl + ChatColor.RESET + " " + racename + " " + ChatColor.AQUA + classname + ChatColor.RESET));
+		        	TextComponent tc = new TextComponent(TextComponent.fromLegacyText(hidden+"["+currentplayer.getName()+"]"+ChatColor.YELLOW + solplayer.getFullName().toUpperCase() + ChatColor.RESET + " ["+ currentplayer.getWorld().getName() +"] - LVL " + ChatColor.AQUA + lvl + ChatColor.RESET + " " + racename + " " + ChatColor.AQUA + classname + ChatColor.RESET));
 
 		        	String worship = "I worship: " + godname + "\n";
 

diff --git a/src/com/solinia/solinia/Models/SoliniaLivingEntity.java b/src/com/solinia/solinia/Models/SoliniaLivingEntity.java
@@ -5375,6 +5375,8 @@ public boolean checkHateTargets() {
 		if (this.getBukkitLivingEntity().isDead())
 			return false;
 
+		//System.out.println("Testing checkHateTargets");
+
 		if (!(this.getBukkitLivingEntity() instanceof Creature))
 			return false;