@@ -45,12 +45,12 @@ public void playerSenderAndReceiver(Player initiator, Player recipient, String m
4545 if (event .isCancelled ()) return ;
4646 initiator .getPersistentDataContainer ().set (lastMessaged , PersistentDataType .STRING , recipient .getName ());
4747 recipient .getPersistentDataContainer ().set (lastMessaged , PersistentDataType .STRING , initiator .getName ());
48- initiator .sendMessage (Resolvers .getInstance ().parseMessagePlayerToPlayer (Message .SENDING_FORMAT .getMessage (), initiator , recipient , messageContent ));
49- recipient .sendMessage (Resolvers .getInstance ().parseMessagePlayerToPlayer (Message .RECEIVING_FORMAT .getMessage (), initiator , recipient , messageContent ));
48+ initiator .sendMessage (Resolvers .getInstance ().parseMessagePlayerToPlayer (Message .SENDING_FORMAT .getMessage (), initiator , recipient , event . getMessageContent () ));
49+ recipient .sendMessage (Resolvers .getInstance ().parseMessagePlayerToPlayer (Message .RECEIVING_FORMAT .getMessage (), initiator , recipient , event . getMessageContent () ));
5050 for (Player spy : spyingPlayers ) {
5151 if (!spy .isOnline ()) continue ;
5252 if (spy .equals (initiator ) || spy .equals (recipient )) continue ;
53- spy .sendMessage (Resolvers .getInstance ().parseMessagePlayerToPlayer (Message .SPY_FORMAT .getMessage (), initiator , recipient , messageContent ));
53+ spy .sendMessage (Resolvers .getInstance ().parseMessagePlayerToPlayer (Message .SPY_FORMAT .getMessage (), initiator , recipient , event . getMessageContent () ));
5454 }
5555 }
5656
@@ -73,13 +73,13 @@ public void consoleSenderPlayerReceiver(CommandSender initiator, Player recipien
7373 Bukkit .getServer ().getPluginManager ().callEvent (event );
7474 if (event .isCancelled ()) return ;
7575 recipient .getPersistentDataContainer ().set (lastMessaged , PersistentDataType .STRING , Message .PDC_CONSOLE .getMessage ());
76- recipient .sendMessage (Resolvers .getInstance ().parseMessageConsoleToPlayer (Message .RECEIVING_FORMAT .getMessage (), consoleChatComponent , recipient , messageContent ));
77- initiator .sendMessage (Resolvers .getInstance ().parseMessageConsoleToPlayer (Message .SENDING_FORMAT .getMessage (), consoleChatComponent , recipient , messageContent ));
76+ recipient .sendMessage (Resolvers .getInstance ().parseMessageConsoleToPlayer (Message .RECEIVING_FORMAT .getMessage (), consoleChatComponent , recipient , event . getMessageContent () ));
77+ initiator .sendMessage (Resolvers .getInstance ().parseMessageConsoleToPlayer (Message .SENDING_FORMAT .getMessage (), consoleChatComponent , recipient , event . getMessageContent () ));
7878 for (Player spy : spyingPlayers ) {
7979 if (!spy .isOnline ()) continue ;
8080 if (spy .equals (initiator ) || spy .equals (recipient )) continue ;
8181 if (!spy .hasPermission (Perm .CONSOLE_MESSAGE_SPY .getPerm ())) continue ;
82- spy .sendMessage (Resolvers .getInstance ().parseMessageConsoleToPlayer (Message .SPY_FORMAT .getMessage (), consoleSpyComponent , recipient , messageContent ));
82+ spy .sendMessage (Resolvers .getInstance ().parseMessageConsoleToPlayer (Message .SPY_FORMAT .getMessage (), consoleSpyComponent , recipient , event . getMessageContent () ));
8383 }
8484 }
8585
@@ -107,12 +107,12 @@ public void playerSenderConsoleReceiver(CommandSender initiator, String messageC
107107 Bukkit .getServer ().getPluginManager ().callEvent (event );
108108 if (event .isCancelled ()) return ;
109109 initiatingPlayer .getPersistentDataContainer ().set (lastMessaged , PersistentDataType .STRING , Message .PDC_CONSOLE .getMessage ());
110- initiatingPlayer .sendMessage (Resolvers .getInstance ().parseMessagePlayerToConsole (Message .SENDING_FORMAT .getMessage (), initiatingPlayer , consoleChatComponent , messageContent ));
110+ initiatingPlayer .sendMessage (Resolvers .getInstance ().parseMessagePlayerToConsole (Message .SENDING_FORMAT .getMessage (), initiatingPlayer , consoleChatComponent , event . getMessageContent () ));
111111 for (Player spy : spyingPlayers ) {
112112 if (!spy .isOnline ()) continue ;
113113 if (spy .equals (initiator )) continue ;
114114 if (!spy .hasPermission (Perm .CONSOLE_MESSAGE_SPY .getPerm ())) continue ;
115- spy .sendMessage (Resolvers .getInstance ().parseMessagePlayerToConsole (Message .SPY_FORMAT .getMessage (),initiatingPlayer , consoleSpyComponent , messageContent ));
115+ spy .sendMessage (Resolvers .getInstance ().parseMessagePlayerToConsole (Message .SPY_FORMAT .getMessage (),initiatingPlayer , consoleSpyComponent , event . getMessageContent () ));
116116 }
117117 }
118118}
0 commit comments