From f4ead570d4d0d09ec2daee44a8e9ffb40e686aba Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 3 Jan 2019 02:09:43 -0800
Subject: [PATCH] Fixed some logic errors with the new mcchatspy command

---
 src/main/java/com/gmail/nossr50/chat/ChatManager.java        | 5 ++++-
 .../java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
index cb8497d3b..49f6f7803 100644
--- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
@@ -56,9 +56,12 @@ public abstract class ChatManager {
                     Party adminParty = UserManager.getPlayer(player).getParty();
 
                     //Only message admins not part of this party
-                    if(adminParty != null && !adminParty.getName().equalsIgnoreCase(partyChatEvent.getParty()))
+                    if(adminParty != null)
                     {
                         //TODO: Incorporate JSON
+                        if(!adminParty.getName().equalsIgnoreCase(partyChatEvent.getParty()))
+                            player.sendMessage(ChatColor.GOLD+"[SPY: "+ChatColor.GREEN+partyChatEvent.getParty()+ChatColor.GOLD+"] "+message);
+                    } else {
                         player.sendMessage(ChatColor.GOLD+"[SPY: "+ChatColor.GREEN+partyChatEvent.getParty()+ChatColor.GOLD+"] "+message);
                     }
                 }
diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
index e588ed151..04b738d04 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
@@ -76,7 +76,7 @@ public class McMMOPlayer {
 
     private boolean abilityUse = true;
     private boolean godMode;
-    private boolean chatSpy = true;
+    private boolean chatSpy = false; //Off by default
 
     private final Map<SuperAbility, Boolean> abilityMode     = new HashMap<SuperAbility, Boolean>();
     private final Map<SuperAbility, Boolean> abilityInformed = new HashMap<SuperAbility, Boolean>();