diff --git a/pom.xml b/pom.xml
index f2e467d78b847e594b2466826ac8d7d36cd05ac8..672242a363335d2541635f25d89d54217f428b66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.slprojects</groupId>
     <artifactId>SLCraftPlugin</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
     <packaging>jar</packaging>
 
     <name>SLCraftPlugin</name>
diff --git a/src/main/java/com/slprojects/slcraftplugin/Main.java b/src/main/java/com/slprojects/slcraftplugin/Main.java
index 01569818cb246c8fa635d97ebd241f0f40220504..e3b1b3fe01cb3a578de0740eb5b833e6ddf593d7 100644
--- a/src/main/java/com/slprojects/slcraftplugin/Main.java
+++ b/src/main/java/com/slprojects/slcraftplugin/Main.java
@@ -9,6 +9,7 @@ import org.bukkit.Statistic;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -76,24 +77,29 @@ public final class Main extends JavaPlugin implements Listener {
         getServer().getOnlinePlayers().forEach(this::savePlayer);
     }
 
-    @EventHandler
-    @SuppressWarnings("unchecked")
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerJoin(PlayerJoinEvent e) {
         playTimeUsersIndexes.add(e.getPlayer().getUniqueId());
         playTimeUsersDate.add(LocalDateTime.now());
 
-        if(getConfig().getBoolean("player-join-playSound")){
-            for(Player p : getServer().getOnlinePlayers()){
+        String welcomeMessage = PlaceholderAPI.setPlaceholders(e.getPlayer(), getConfig().getString("player-join-message"));
+        e.setJoinMessage(welcomeMessage);
+        for(Player p : getServer().getOnlinePlayers()){
+            if(getConfig().getBoolean("player-join-playSound")){
                 p.playSound(p.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0);
             }
+            //p.sendMessage(welcomeMessage);
         }
-        getLogger().info("test");
-        getServer().broadcastMessage(getConfig().getString("player-join-message"));
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerQuit(PlayerQuitEvent e) {
         savePlayer(e.getPlayer());
+        String quitMessage = PlaceholderAPI.setPlaceholders(e.getPlayer(), getConfig().getString("player-quit-message"));
+        e.setQuitMessage(quitMessage);
+        for(Player p : getServer().getOnlinePlayers()){
+            //p.sendMessage(quitMessage);
+        }
     }
 
     // Propre au compteur de temps de jeu
diff --git a/target/SLCraftPlugin-1.2.jar b/target/SLCraftPlugin-1.2.jar
deleted file mode 100644
index f5e4fffa2175b9fbad35b63ce2585949fb3810d7..0000000000000000000000000000000000000000
Binary files a/target/SLCraftPlugin-1.2.jar and /dev/null differ
diff --git a/target/classes/com/slprojects/slcraftplugin/Main.class b/target/classes/com/slprojects/slcraftplugin/Main.class
index b66ae20dbc21982bee8014ae3a3668cf7b8e0459..dede04c7759f58dd94d7996915db5017addd35b0 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/classes/config.yml b/target/classes/config.yml
index 5727bb44f8a6d5c74b28018e0735064bf229efc5..a7e69bce7d7de82a5afd10793c5b64c6592c7556 100644
--- a/target/classes/config.yml
+++ b/target/classes/config.yml
@@ -21,4 +21,8 @@ database:
   port: 3306 # default port for MariaDB and MySQL
   database: db # name of your database. A database server can contain multiple databases
   user: username
-  password: password
\ No newline at end of file
+  password: password
+
+player-join-playSound: true
+player-join-message: "&a%player_name% &fa rejoint le serveur :D"
+player-quit-message: "&a%player_name% &fvient de quitter le serveur :'("
\ No newline at end of file
diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
index 6bbe26215812b216eeeeebb8c8f6adc6ddc0694f..b53f9a6bedc5bdc2de4fd397fd4233a014d67b88 100644
--- a/target/classes/plugin.yml
+++ b/target/classes/plugin.yml
@@ -1,5 +1,5 @@
 name: SLCraftPlugin
-version: '1.2'
+version: '1.3'
 main: com.slprojects.slcraftplugin.Main
 depend: [PlaceholderAPI]
 api-version: 1.18
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 944a583ec5922368ca65e959434b8e0a5ab69743..7e0909c6c17714a652db36e8c65689af8f93398e 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Jan 28 13:57:57 CET 2022
+#Fri Jan 28 14:26:51 CET 2022
 groupId=com.slprojects
 artifactId=SLCraftPlugin
-version=1.2
+version=1.3
diff --git a/target/original-SLCraftPlugin-1.2.jar b/target/original-SLCraftPlugin-1.2.jar
deleted file mode 100644
index db21eee01511f5a1f2c0f53df75d297126bc8c59..0000000000000000000000000000000000000000
Binary files a/target/original-SLCraftPlugin-1.2.jar and /dev/null differ