fixed bugs

Simonsator · Jul 30, 2016 · 568338f · ricardoboss · Aug 5, 2016 · 568338f
1 parent 77793aa
commit 568338f
Show file tree

Hide file tree

Showing 39 changed files with 640 additions and 1,083 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.simonsator</groupId>
     <artifactId>BungeecordPartyAndFriends</artifactId>
-    <version>1.0.33</version>
+    <version>1.0.34</version>
     <name>BungeecordPartyAndFriends</name>
     <packaging>jar</packaging>
     <description>BungeecordPartyAndFriends</description>

diff --git a/src/main/java/de/simonsator/partyandfriends/api/TopCommand.java b/src/main/java/de/simonsator/partyandfriends/api/TopCommand.java
@@ -2,6 +2,7 @@
 
 import de.simonsator.partyandfriends.main.Main;
 import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer;
+import de.simonsator.partyandfriends.utilities.Language;
 import de.simonsator.partyandfriends.utilities.SubCommand;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -22,7 +23,7 @@ protected TopCommand(String[] pCommandNames, String pPermission) {
 
 	public static boolean isPlayer(CommandSender pCommandSender) {
 		if (!(pCommandSender instanceof ProxiedPlayer)) {
-			if (Main.getInstance().getLanguage().equalsIgnoreCase("own")) {
+			if (Main.getInstance().getLanguage() == Language.OWN) {
 				Main.getInstance().loadConfiguration();
 				pCommandSender.sendMessage(
 						new TextComponent(Main.getInstance().getFriendsPrefix() + "Config and MessagesYML reloaded!"));

diff --git a/...ain/java/de/simonsator/partyandfriends/api/friends/abstractcommands/FriendSubCommand.java b/...ain/java/de/simonsator/partyandfriends/api/friends/abstractcommands/FriendSubCommand.java
@@ -8,7 +8,7 @@
 import java.util.regex.Matcher;
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
-import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN;
+import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN;
 
 public abstract class FriendSubCommand extends SubCommand implements Comparable<SubCommand> {
 
@@ -28,7 +28,7 @@ protected boolean isPlayerGiven(OnlinePAFPlayer pPlayer, String[] args) {
 
 	protected boolean isAFriendOf(OnlinePAFPlayer pPlayer, PAFPlayer pGivenPlayer) {
 		if (!pPlayer.isAFriendOf(pGivenPlayer)) {
-			pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance()
+			pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance()
 					.getMessagesYml().getString("Friends.General.PlayerIsOffline")).replaceAll(Matcher.quoteReplacement(pGivenPlayer.getName()))));
 			pPlayer.sendMessage(new TextComponent(HELP));
 			return false;

diff --git a/.../de/simonsator/partyandfriends/api/friends/abstractcommands/RequestReactionsCommands.java b/.../de/simonsator/partyandfriends/api/friends/abstractcommands/RequestReactionsCommands.java
@@ -7,7 +7,7 @@
 import java.util.regex.Matcher;
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
-import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN;
+import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN;
 
 public abstract class RequestReactionsCommands extends FriendSubCommand {
 
@@ -17,7 +17,7 @@ protected RequestReactionsCommands(String[] pCommands, int pPriority, String pHe
 
 	protected boolean hasNoRequest(OnlinePAFPlayer pPlayer, PAFPlayer pQueryPlayer) {
 		if ((!pPlayer.hasRequestFrom(pQueryPlayer))) {
-			pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance()
+			pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance()
 					.getMessagesYml().getString("Friends.Command.Accept.ErrorNoFriendShipInvitation")).replaceAll(Matcher.quoteReplacement(pQueryPlayer.getName()))));
 			pPlayer.sendMessage(new TextComponent(HELP));
 			return true;

diff --git a/src/main/java/de/simonsator/partyandfriends/api/pafplayers/OnlinePAFPlayer.java b/src/main/java/de/simonsator/partyandfriends/api/pafplayers/OnlinePAFPlayer.java
@@ -1,7 +1,5 @@
 package de.simonsator.partyandfriends.api.pafplayers;
 
-import java.util.ArrayList;
-
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.protocol.packet.Chat;
@@ -24,7 +22,7 @@ public interface OnlinePAFPlayer extends PAFPlayer {
 
 	/**
 	 * @return Returns the player if he is on this Bungeecord. If he is on
-	 *         another Bungeecord (RedisBungee) it returns null.
+	 * another Bungeecord (RedisBungee) it returns null.
 	 */
 	ProxiedPlayer getPlayer();
 }
diff --git a/src/main/java/de/simonsator/partyandfriends/api/party/PlayerParty.java b/src/main/java/de/simonsator/partyandfriends/api/party/PlayerParty.java
@@ -3,7 +3,7 @@
 import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer;
 import de.simonsator.partyandfriends.api.pafplayers.PAFPlayer;
 import de.simonsator.partyandfriends.main.Main;
-import de.simonsator.partyandfriends.utilities.CompilePatter;
+import de.simonsator.partyandfriends.utilities.PatterCollection;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.protocol.packet.Chat;
@@ -13,7 +13,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 
-import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN;
+import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN;
 
 /**
  * Objects of this class are the party, where a player is in
@@ -88,7 +88,7 @@ public List<OnlinePAFPlayer> getAllPlayers() {
 	private void removePlayer(OnlinePAFPlayer pPlayer) {
 		removePlayerSilent(pPlayer);
 		sendMessage(new TextComponent(Main.getInstance().getPartyPrefix()
-				+ CompilePatter.PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.General.PlayerHasLeftTheParty")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))));
+				+ PatterCollection.PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.General.PlayerHasLeftTheParty")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))));
 	}
 
 	protected abstract void removePlayerSilent(OnlinePAFPlayer pPlayer);
@@ -124,7 +124,7 @@ public void kickPlayer(OnlinePAFPlayer pPlayer) {
 		pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + Main.getInstance().getMessagesYml()
 				.getString("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer")));
 		this.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix()
-				+ PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Kick.KickedPlayerOutOfThePartyOthers"))
+				+ PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Kick.KickedPlayerOutOfThePartyOthers"))
 				.replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))));
 		deleteParty();
 	}
@@ -137,10 +137,10 @@ public void kickPlayer(OnlinePAFPlayer pPlayer) {
 	public void invite(final OnlinePAFPlayer pPlayer) {
 		addToInvited(pPlayer);
 		OnlinePAFPlayer lLeader = getLeader();
-		pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml()
+		pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml()
 				.getString("Party.Command.Invite.YouWereInvitedBY")).replaceAll(Matcher.quoteReplacement(lLeader.getDisplayName()))));
 		pPlayer.sendPacket(new Chat("{\"text\":\"" + Main.getInstance().getPartyPrefix()
-				+ PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE")).replaceAll(Matcher.quoteReplacement(lLeader.getName()))
+				+ PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE")).replaceAll(Matcher.quoteReplacement(lLeader.getName()))
 				+ "\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"" + "/"
 				+ Main.getInstance().getPartyCommand().getName() + " join " + lLeader.getName()
 				+ "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
@@ -153,9 +153,9 @@ public void run() {
 				if (isInvited(pPlayer)) {
 					removeFromInvited(pPlayer);
 					OnlinePAFPlayer lLeader = getLeader();
-					pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN.matcher(Main.getInstance()
+					pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN.matcher(Main.getInstance()
 							.getMessagesYml().getString("Party.Command.Invite.InvitationTimedOutInvited")).replaceAll(Matcher.quoteReplacement(lLeader.getDisplayName()))));
-					lLeader.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN.matcher(Main.getInstance()
+					lLeader.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN.matcher(Main.getInstance()
 							.getMessagesYml().getString("Party.Command.Invite.InvitationTimedOutLeader")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))));
 					if (isPartyEmpty()) {
 						lLeader.sendMessage(

diff --git a/...in/java/de/simonsator/partyandfriends/api/party/abstractcommands/LeaderNeededCommand.java b/...in/java/de/simonsator/partyandfriends/api/party/abstractcommands/LeaderNeededCommand.java
@@ -9,7 +9,7 @@
 import java.util.regex.Matcher;
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
-import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN;
+import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN;
 
 public abstract class LeaderNeededCommand extends PartySubCommand {
 
@@ -24,14 +24,14 @@ public boolean hasAccess(int pPermissionHeight) {
 
 	protected boolean checkIsInParty(OnlinePAFPlayer pPlayer, PAFPlayer pSearched, PlayerParty pParty, String[] args) {
 		if (!pSearched.isOnline()) {
-			pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYERPATTERN
+			pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYER_PATTERN
 					.matcher(getInstance().getMessagesYml()
 							.getString("Party.Command.General.ErrorGivenPlayerIsNotInTheParty"))
 					.replaceAll(Matcher.quoteReplacement(args[0]))));
 			return false;
 		}
 		if (!pParty.isInParty((OnlinePAFPlayer) pSearched)) {
-			pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYERPATTERN
+			pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYER_PATTERN
 					.matcher(getInstance().getMessagesYml()
 							.getString("Party.Command.General.ErrorGivenPlayerIsNotInTheParty"))
 					.replaceAll(Matcher.quoteReplacement(args[0]))));

diff --git a/src/main/java/de/simonsator/partyandfriends/communication/sql/Importer.java b/src/main/java/de/simonsator/partyandfriends/communication/sql/Importer.java
@@ -1,9 +1,8 @@
 package de.simonsator.partyandfriends.communication.sql;
 
-import de.simonsator.partyandfriends.utilities.StringToArray;
-
 import java.sql.*;
 import java.util.ArrayList;
+import java.util.StringTokenizer;
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
 
@@ -65,7 +64,7 @@ private int[] getRequests(int pID) {
 			rs = (stmt = con.createStatement()).executeQuery(
 					"select FreundschaftsAnfragenID from " + database + ".freunde WHERE ID='" + pID + "' LIMIT 1");
 			if (rs.next())
-				return StringToArray.stringToIntegerArray(rs.getString("FreundschaftsAnfragenID"));
+				return stringToIntegerArray(rs.getString("FreundschaftsAnfragenID"));
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} finally {
@@ -154,7 +153,7 @@ private int[] getSettings(int pPlayerID) {
 	}
 
 	private int[] getFriendsArray(int idSender) {
-		return StringToArray.stringToIntegerArray(getFriends(idSender));
+		return stringToIntegerArray(getFriends(idSender));
 	}
 
 	private String getFriends(int pID) {
@@ -296,4 +295,13 @@ private class PlayerCollection {
 		}
 	}
 
+	private static int[] stringToIntegerArray(String string) {
+		StringTokenizer st = new StringTokenizer(string, "|");
+		int stLength = st.countTokens();
+		int[] stArray = new int[stLength];
+		for (int i = 0; i < stLength; i++) {
+			stArray[i] = Integer.parseInt(st.nextToken());
+		}
+		return stArray;
+	}
 }
diff --git a/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQL.java b/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQL.java
@@ -1,14 +1,12 @@
 package de.simonsator.partyandfriends.communication.sql;
 
-import de.simonsator.partyandfriends.pafplayers.manager.PAFPlayerManagerMySQL;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.UUID;
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
-import static de.simonsator.partyandfriends.main.Main.getPlayerManager;
 
 /**
  * @author Simonsator
@@ -21,18 +19,15 @@ public class MySQL extends SQLCommunication {
 	/**
 	 * Connects to the MySQL server
 	 *
-	 * @param pHost        The MySQL host
-	 * @param pUsername    The MySQL user
-	 * @param pPassword    The MySQL password
-	 * @param pPort        The port of the MySQL server
-	 * @param pDatabase    The MySQL database
-	 * @param pTablePrefix The prefix of the tables
+	 * @param pMySQLData The MySQL data
 	 */
-	public MySQL(String pHost, String pUsername, String pPassword, int pPort, String pDatabase, String pTablePrefix) {
-		super(pDatabase, "jdbc:mysql://" + pHost + ":" + pPort + "/?user=" + pUsername + "&password=" + pPassword);
-		this.tablePrefix = pTablePrefix;
+	public MySQL(MySQLData pMySQLData) {
+		super(pMySQLData.DATABASE, "jdbc:mysql://" + pMySQLData.HOST + ":" + pMySQLData.PORT + "/?user="
+				+ pMySQLData.USERNAME + "&password=" + pMySQLData.PASSWORD);
+		this.tablePrefix = pMySQLData.TABLE_PREFIX;
 		importDatabase();
-		(new Importer(pDatabase, "jdbc:mysql://" + pHost + ":" + pPort + "/?user=" + pUsername + "&password=" + pPassword, this)).closeConnection();
+		new Importer(pMySQLData.DATABASE, "jdbc:mysql://" + pMySQLData.HOST + ":" + pMySQLData.PORT + "/?user="
+				+ pMySQLData.USERNAME + "&password=" + pMySQLData.PASSWORD, this);
 		closeConnection();
 	}
 
@@ -529,39 +524,7 @@ private void removeSetting(int pPlayerID, int pSettingsID) {
 			}
 		}
 	}
-
-	/**
-	 * Saves an offline message in MySQL
-	 *
-	 * @param idSender   Sender of the message
-	 * @param idReceiver Receiver of the message
-	 * @param pMessage   The message, that should be send
-	 */
-	public void offlineMessage(int idSender, int idReceiver, String pMessage) {
-		Connection con = getConnection();
-		PreparedStatement prepStmt = null;
-		int time = (int) (System.currentTimeMillis() / 1000L);
-		try {
-			prepStmt = con.prepareStatement(
-					"insert into  " + this.database + "." + tablePrefix + "friends_messcages	 values (?, ?, ?, ?)");
-			prepStmt.setInt(2, idSender);
-			prepStmt.setInt(3, idReceiver);
-			prepStmt.setString(1, pMessage);
-			prepStmt.setInt(4, time);
-			prepStmt.executeUpdate();
-
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				if (prepStmt != null)
-					prepStmt.close();
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
+
 	public boolean isAFriendOf(int pPlayerID1, int pPlayerID2) {
 		Connection con = getConnection();
 		Statement stmt = null;

diff --git a/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQLData.java b/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQLData.java
@@ -0,0 +1,23 @@
+package de.simonsator.partyandfriends.communication.sql;
+
+/**
+ * @author Simonsator
+ * @version 1.0.0 on 19.07.16.
+ */
+public class MySQLData {
+	public final String HOST;
+	public final String USERNAME;
+	public final String PASSWORD;
+	public final int PORT;
+	public final String DATABASE;
+	public final String TABLE_PREFIX;
+
+	public MySQLData(String host, String username, String password, int port, String database, String table_prefix) {
+		HOST = host;
+		USERNAME = username;
+		PASSWORD = password;
+		PORT = port;
+		DATABASE = database;
+		TABLE_PREFIX = table_prefix;
+	}
+}
diff --git a/src/main/java/de/simonsator/partyandfriends/friends/commands/MSG.java b/src/main/java/de/simonsator/partyandfriends/friends/commands/MSG.java
@@ -12,7 +12,7 @@
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
 import static de.simonsator.partyandfriends.main.Main.getPlayerManager;
-import static de.simonsator.partyandfriends.utilities.CompilePatter.*;
+import static de.simonsator.partyandfriends.utilities.PatterCollection.*;
 
 /**
  * Will be executed on /msg
@@ -98,6 +98,19 @@ boolean messageGiven(OnlinePAFPlayer pPlayer, String[] args, int n) {
 		return true;
 	}
 
+	/**
+	 * Delivers a message that was send, while a player was offline
+	 *
+	 * @param pContent   Content of the message
+	 * @param pWrittenTo The player which was written to
+	 * @param pSender    The name of the sender
+	 */
+	public void deliverOfflineMessage(String pContent, OnlinePAFPlayer pWrittenTo, PAFPlayer pSender) {
+		sendMessage(
+				SPACE_PATTERN.matcher(pContent).replaceAll(Matcher.quoteReplacement(getInstance().getMessagesYml().getString("Friends.Command.MSG.ColorOfMessage"))),
+				pWrittenTo, pSender.getDisplayName(), pWrittenTo.getDisplayName());
+	}
+
 	private boolean isOffline(OnlinePAFPlayer pPlayer, PAFPlayer pQueryPlayer) {
 		if (!pQueryPlayer.isOnline()) {
 			pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix()
@@ -131,7 +144,7 @@ private void sendMessage(String pContent, OnlinePAFPlayer pPlayer1, OnlinePAFPla
 	}
 
 	private void sendMessage(String pContent, OnlinePAFPlayer pReceiver, String pSenderName, String pReceiverName) {
-		pReceiver.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + CONTENTPATTERN.matcher(PLAYERPATTERN.matcher(SENDERNAMEPATTERN.matcher(getInstance()
+		pReceiver.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + CONTENT_PATTERN.matcher(PLAYER_PATTERN.matcher(SENDER_NAME_PATTERN.matcher(getInstance()
 				.getMessagesYml().getString("Friends.Command.MSG.SentMessage")).replaceAll(Matcher.quoteReplacement(pSenderName))).replaceAll(Matcher.quoteReplacement(pReceiverName))).replaceAll(Matcher.quoteReplacement(pContent))));
 	}
 

diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Accept.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Accept.java
@@ -15,7 +15,7 @@
 
 import static de.simonsator.partyandfriends.main.Main.getInstance;
 import static de.simonsator.partyandfriends.main.Main.getPlayerManager;
-import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN;
+import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN;
 
 /**
  * The command accept
@@ -39,17 +39,17 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) {
 			return;
 		pPlayer.addFriend(playerQuery);
 		pPlayer.denyRequest(playerQuery);
-		pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance()
+		pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance()
 				.getMessagesYml().getString("Friends.Command.Accept.NowFriends")).replaceAll(Matcher.quoteReplacement(args[1]))));
 		if (!playerQuery.isOnline())
 			return;
 		OnlinePAFPlayer friend = (OnlinePAFPlayer) playerQuery;
-		friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml()
+		friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml()
 				.getString("Friends.Command.Accept.NowFriends")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))));
-		friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml()
+		friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml()
 				.getString("Friends.General.PlayerIsNowOnline")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))));
 		pPlayer.sendMessage(
-				new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml()
+				new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml()
 						.getString("Friends.General.PlayerIsNowOnline")).replaceAll(Matcher.quoteReplacement(friend.getDisplayName()))));
 	}