From 8f5ec71cc201016db7fd8128031f387b20fd6fe3 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Tue, 26 Mar 2024 09:45:12 +0000
Subject: [PATCH] fix player colors

---
 .gitignore                                    |  1 +
 .../fascinated/playercolor/PlayerColor.java   | 20 --------------
 .../playercolor/PlayerColorManager.java       | 26 +++++++++++++++++++
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37fe707..8c1c60e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ target/
 
 ### IntelliJ IDEA ###
 .idea
+.idea/*
 *.iws
 *.iml
 *.ipr
diff --git a/src/main/java/cc/fascinated/playercolor/PlayerColor.java b/src/main/java/cc/fascinated/playercolor/PlayerColor.java
index e6de096..60aad9c 100644
--- a/src/main/java/cc/fascinated/playercolor/PlayerColor.java
+++ b/src/main/java/cc/fascinated/playercolor/PlayerColor.java
@@ -6,10 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scoreboard.Team;
 
 @Getter @Setter
@@ -48,20 +44,4 @@ public class PlayerColor extends Profile {
     public void save(ConfigurationSection section) {
         section.set("color", this.color.value());
     }
-
-    @EventHandler
-    public void onLogin(PlayerLoginEvent event) {
-        Player player = event.getPlayer();
-
-        Team team = PlayerColorManager.getScoreboardTeam(this.color);
-        team.addEntry(player.getName());
-    }
-
-    @EventHandler
-    public void onQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-
-        Team team = PlayerColorManager.getScoreboardTeam(this.color);
-        team.removeEntry(player.getName());
-    }
 }
diff --git a/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java b/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java
index b7872f1..c723856 100644
--- a/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java
+++ b/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java
@@ -1,10 +1,16 @@
 package cc.fascinated.playercolor;
 
+import cc.fascinated.account.Account;
+import cc.fascinated.account.AccountManager;
 import cc.fascinated.playercolor.command.PlayerColorCommand;
 import cc.fascinated.utils.Manager;
 import lombok.Getter;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
@@ -73,4 +79,24 @@ public class PlayerColorManager extends Manager {
 
         return team;
     }
+
+    @EventHandler
+    public void onLogin(PlayerLoginEvent event) {
+        Player player = event.getPlayer();
+        Account account = AccountManager.getAccount(player.getUniqueId());
+        PlayerColor playerColor = account.getPlayerColorProfile();
+
+        Team team = PlayerColorManager.getScoreboardTeam(playerColor.getColor());
+        team.addEntry(player.getName());
+    }
+
+    @EventHandler
+    public void onQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        Account account = AccountManager.getAccount(player.getUniqueId());
+        PlayerColor playerColor = account.getPlayerColorProfile();
+
+        Team team = PlayerColorManager.getScoreboardTeam(playerColor.getColor());
+        team.removeEntry(player.getName());
+    }
 }