From 5c5d842371ecef54fd07b0758b3bc04982dac7ed Mon Sep 17 00:00:00 2001
From: yourfriendoss <81387799+yourfriendoss@users.noreply.github.com>
Date: Mon, 1 Apr 2024 11:04:11 +0300
Subject: [PATCH] fix vault detection + add <reset>

---
 src/main/java/lv/pi/animalrp/AnimalRP.java       | 16 +++++++++++++---
 .../lv/pi/animalrp/listeners/PlayerChat.java     |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/lv/pi/animalrp/AnimalRP.java b/src/main/java/lv/pi/animalrp/AnimalRP.java
index a5e743e..5a47ae3 100644
--- a/src/main/java/lv/pi/animalrp/AnimalRP.java
+++ b/src/main/java/lv/pi/animalrp/AnimalRP.java
@@ -34,6 +34,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.logging.Level;
 import java.util.UUID;
 
 import org.bukkit.plugin.PluginManager;
@@ -123,13 +124,22 @@ public class AnimalRP extends JavaPlugin {
 		}
     }
 
-    @Override
-    public void onEnable() {
+    public boolean setupVault() {
+        if (getServer().getPluginManager().getPlugin("Vault") == null) {
+            return false;
+        }
         RegisteredServiceProvider<Chat> rsp = getServer().getServicesManager().getRegistration(Chat.class);
         if(rsp != null) {
             AnimalRP.vaultChat = rsp.getProvider();
         } else {
-            System.out.println("[AnimalRP] !!! Missing vault, prefix/suffix will not be included in chat formatting.");
+            return false;
+        } 
+        return true;
+    }
+    @Override
+    public void onEnable() {
+        if(!setupVault()) {
+            this.getLogger().log(Level.WARNING, "!!! Missing vault, prefix/suffix will not be included in chat formatting.");
         }
         AnimalRP.users = new HashMap<UUID, Animal>();
         AnimalRP.isChatModOff = new HashMap<UUID, Boolean>();
diff --git a/src/main/java/lv/pi/animalrp/listeners/PlayerChat.java b/src/main/java/lv/pi/animalrp/listeners/PlayerChat.java
index 36ae981..b28dbfe 100644
--- a/src/main/java/lv/pi/animalrp/listeners/PlayerChat.java
+++ b/src/main/java/lv/pi/animalrp/listeners/PlayerChat.java
@@ -54,7 +54,7 @@ public class PlayerChat implements Listener {
             }     
         }
 
-        String format = "%prefix%teamColor%animalColor%name%suffix: %message";
+        String format = "%prefix%teamColor%animalColor%name%suffix<reset>: %message";
         String message = format;
         if(AnimalRP.vaultChat != null) {
             message = message.replaceAll("%prefix", AnimalRP.vaultChat.getPlayerPrefix(event.getPlayer()));