From 25a54882c9276eaeb1dd92c36e9c6047f7c896b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Ulf=20J=C3=B8rgensen?= <magnus@muj.dk>
Date: Sun, 28 May 2017 18:23:14 +0200
Subject: [PATCH] Fix message colour for invite commands

---
 src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java   | 4 ++--
 .../massivecraft/factions/cmd/CmdFactionsInviteRemove.java    | 2 +-
 src/com/massivecraft/factions/entity/Faction.java             | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
index 0ef2be4b..385edd03 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
@@ -47,7 +47,7 @@ public class CmdFactionsInviteAdd extends FactionsCommand
 			// Already member?
 			if (mplayer.getFaction() == msenderFaction)
 			{
-				msg("%s<i> is already a member of %s<i>.", mplayer.getName(), msenderFaction.getName());
+				msg("%s<i> is already a member of %s<i>.", mplayer.getName(), msenderFaction.getName(msender));
 				continue;
 			}
 			
@@ -83,7 +83,7 @@ public class CmdFactionsInviteAdd extends FactionsCommand
 				);
 				
 				// Inform
-				msg("%s <i>is already invited to %s<i>.", mplayer.getName(), msenderFaction.getName());
+				msg("%s <i>is already invited to %s<i>.", mplayer.getName(), msenderFaction.getName(msender));
 				message(remove);
 			}
 		}
diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
index 160b7c58..71219466 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
@@ -75,7 +75,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand
 				);
 				
 				// Inform
-				msg("%s<i> is already a member of %s<i>.", mplayer.getName(), msenderFaction.getName());
+				msg("%s<i> is already a member of %s<i>.", mplayer.getName(), msenderFaction.getName(msender));
 				message(kick);
 				continue;
 			}
diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java
index efb3cceb..57b39ce7 100644
--- a/src/com/massivecraft/factions/entity/Faction.java
+++ b/src/com/massivecraft/factions/entity/Faction.java
@@ -459,6 +459,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 	
 	public boolean uninvite(String playerId)
 	{
+		System.out.println(playerId);
 		return this.getInvitations().detachId(playerId) != null;
 	}