From b48f97fd2e870108cbb53899612582c00a57fe52 Mon Sep 17 00:00:00 2001
From: TadahTech <tandis96@hotmail.com>
Date: Thu, 21 Jul 2016 03:46:18 -0500
Subject: [PATCH] Fix stupid JOOQ issue and IntelliJ.

---
 .../Mineplex.Core/src/mineplex/core/party/Lang.java |  2 +-
 .../game/arcade/managers/chat/GameChatManager.java  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java b/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
index ce270eae8..0cccd2bc9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
@@ -15,7 +15,7 @@ public enum Lang
 	SUCCESS_SERVER_CONNECT("Sending you and your party to {0}..."),
 	INVITE_SUCCESS_PLAYER("Successfully invited {0} to the party."),
 	SUCCESS_INVITE("{0} has invited {1} to the party."),
-	INVITE_RECEIVED("You have been invited to {0}'s party! You have 60 seconds to reply."),
+	INVITE_RECEIVED("You have been invited to {0}''s party! You have 60 seconds to reply."),
 	INVITE_ACCEPT("{0} has joined the party."),
 	INVITE_DENY("{0} declined your invite."),
 	INVITE_EXPIRED("{0} did not respond in time."),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java
index 6c63497ef..996fc364c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java
@@ -11,7 +11,6 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.Game.GameState;
 import nautilus.game.arcade.game.GameTeam;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -21,11 +20,11 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.jooq.tools.json.JSONObject;
 
 import java.text.DecimalFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static mineplex.database.routines.Test.playerName;
-import static sun.audio.AudioPlayer.player;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
 
 public class GameChatManager implements Listener
 {
@@ -131,7 +130,7 @@ public class GameChatManager implements Listener
 				event.getRecipients().clear();
 
 				event.setMessage(event.getMessage().substring(1, event.getMessage().length()));
-				event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + playerName + " " + C.cPurple + "%2$s");
+				event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + event.getPlayer().getName() + " " + C.cPurple + "%2$s");
 
 				for (String member : party.getMembers())
 				{