diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0fe21feb46d72337f36284bbb43b8deb5c1c6d4e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+target/SLCraftPlugin-1.6.0.jar
+*.jar
diff --git a/src/main/java/com/slprojects/slcraftplugin/Main.java b/src/main/java/com/slprojects/slcraftplugin/Main.java
index 4bf820d4e66a920d598e5547b374a2d26fdcabbe..17246908b478c0d34088d461fea2c8047df7e033 100644
--- a/src/main/java/com/slprojects/slcraftplugin/Main.java
+++ b/src/main/java/com/slprojects/slcraftplugin/Main.java
@@ -5,6 +5,8 @@ import com.slprojects.slcraftplugin.commandes.wildCommand;
 import com.slprojects.slcraftplugin.tachesParalleles.savePlayerData;
 import com.slprojects.slcraftplugin.tachesParalleles.internalWebServer;
 import me.clip.placeholderapi.PlaceholderAPI;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Sound;
@@ -138,19 +140,30 @@ public final class Main extends JavaPlugin implements Listener {
 
 
         // On envoie le message sur discord
-        sendMessageToDiscord(e.getMessage(), e.getPlayer().getName());
+
         for (Player p: Bukkit.getOnlinePlayers()) {
-            if(FinalMessage.toLowerCase().contains(p.getName().toLowerCase()) && (FinalMessage.charAt(FinalMessage.toLowerCase().indexOf(p.getName().toLowerCase())-1) != "@".charAt(0))){
-                //Simple coloration
-                int i = FinalMessage.indexOf(p.getName().toLowerCase());
-                FinalMessage = FinalMessage.substring(0, i) + "§b" + FinalMessage.substring(i) + "§r";
-            } else if (FinalMessage.toLowerCase().contains(p.getName().toLowerCase()) && FinalMessage.charAt(FinalMessage.toLowerCase().indexOf(p.getName().toLowerCase())-1) == "@".charAt(0)){
-                //Mention
-                FinalMessage = FinalMessage + " ";
-                FinalMessage = Pattern.compile("@(.*?) ").matcher(FinalMessage).replaceAll("§l§d@$1§r ");
-                FinalMessage = FinalMessage.substring(0,FinalMessage.length()-1);
+            //Simple coloration
+            FinalMessage = FinalMessage.replace(e.getPlayer().getName(),"§b" + e.getPlayer().getName());
+            while (FinalMessage.contains("@") && (FinalMessage.charAt(FinalMessage.indexOf("@")-1 )!= "b".charAt(0))){
+                gg.sendMessage("while");
+                if (FinalMessage.toLowerCase().contains(p.getName().toLowerCase()) && FinalMessage.charAt(FinalMessage.toLowerCase().indexOf(p.getName().toLowerCase())-1) == "@".charAt(0)){
+                    //Mention
+                    FinalMessage = FinalMessage + " ";
+
+                    String pseudo = FinalMessage.substring(FinalMessage.indexOf("@")+1);
+                    pseudo = pseudo.substring(0,pseudo.charAt(pseudo.indexOf(" ")-1) == " ".charAt(0) ? pseudo.indexOf(" ") : pseudo.charAt(pseudo.indexOf(" ")-1) == ",".charAt(0) ? pseudo.indexOf(",") : pseudo.charAt(pseudo.indexOf(" ")-1) == ".".charAt(0) ? pseudo.indexOf(".") : 0);
+                    Player MentionedPlayer = Bukkit.getPlayer(pseudo);
+                    FinalMessage = Pattern.compile("@(.*?) ").matcher(FinalMessage).replaceAll("§r§l§d@$1§r ");
+                    FinalMessage = FinalMessage.substring(0,FinalMessage.length()-1);
+                    MentionedPlayer.sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText("§b " + e.getPlayer().getName() + " §amentioned you !"));
+                    MentionedPlayer.playSound(MentionedPlayer.getLocation(),Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 100, 2);
+                    gg.sendMessage("true " + FinalMessage);
+                }
             }
+
+
             p.sendMessage(FinalMessage);
+            sendMessageToDiscord(FinalMessage, e.getPlayer().getName());
         }
         e.setCancelled(true);
     }
diff --git a/target/SLCraftPlugin-1.6.0.jar b/target/SLCraftPlugin-1.6.0.jar
index 0fbd5afda67d045b560b4fecbea4566be52a42cd..0c95637955038e39d78a37679bde7f67045e71ab 100644
Binary files a/target/SLCraftPlugin-1.6.0.jar and b/target/SLCraftPlugin-1.6.0.jar differ
diff --git a/target/classes/com/slprojects/slcraftplugin/Main.class b/target/classes/com/slprojects/slcraftplugin/Main.class
index 9ecc380b97627e295b5b5aa7c1a6aedcffab9560..6106ec67018b604c49142177cf62e9bc29862d30 100644
Binary files a/target/classes/com/slprojects/slcraftplugin/Main.class and b/target/classes/com/slprojects/slcraftplugin/Main.class differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 2737433dd1f9309574dbdd322ff41fc7420180ba..fc66f11da3057956c85159612eee98b38bcca7ec 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Sat Jul 09 14:47:19 CEST 2022
+#Sat Jul 09 19:43:22 CEST 2022
 groupId=com.slprojects
 artifactId=SLCraftPlugin
 version=1.6.0
diff --git a/target/original-SLCraftPlugin-1.6.0.jar b/target/original-SLCraftPlugin-1.6.0.jar
index a9654b24aa7761e53f8d4595b12ee6670f017bae..5c702d2ca37023192571b000ef8a244e6e59f184 100644
Binary files a/target/original-SLCraftPlugin-1.6.0.jar and b/target/original-SLCraftPlugin-1.6.0.jar differ