2.2.0

src/main/java/net/momirealms/customnameplates/CustomNameplates.java

@@ -23,8 +23,8 @@ import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.BubblesCommand;
+import net.momirealms.customnameplates.command.BubblesCommand;
-import net.momirealms.customnameplates.commands.NameplateCommand;
+import net.momirealms.customnameplates.command.NameplateCommand;
 import net.momirealms.customnameplates.helper.LibraryLoader;
 import net.momirealms.customnameplates.helper.VersionHelper;
 import net.momirealms.customnameplates.manager.*;

src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java

@@ -36,11 +36,7 @@ public class CustomNameplatesAPI {
     }
 
     private void updateAndSave(Player player) {
-        NameplatesTeam nameplatesTeam = plugin.getTeamManager().getNameplateTeam(player.getUniqueId());
+        updateNameplateTeam(player);
-        if (nameplatesTeam != null) {
-            nameplatesTeam.update(true);
-            plugin.getTeamManager().sendUpdateToAll(player, true);
-        }
         Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             plugin.getDataManager().saveData(player);
         });
@@ -64,4 +60,12 @@ public class CustomNameplatesAPI {
             plugin.getDataManager().saveData(player);
         });
     }
+
+    public void updateNameplateTeam(Player player) {
+        NameplatesTeam nameplatesTeam = plugin.getTeamManager().getNameplateTeam(player.getUniqueId());
+        if (nameplatesTeam != null) {
+            nameplatesTeam.update(true);
+            plugin.getTeamManager().sendUpdateToAll(player, true);
+        }
+    }
 }

src/main/java/net/momirealms/customnameplates/command/AbstractMainCommand.java

@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands;
+package net.momirealms.customnameplates.command;
 
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;

src/main/java/net/momirealms/customnameplates/command/AbstractSubCommand.java

@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands;
+package net.momirealms.customnameplates.command;
 
 import net.momirealms.customnameplates.CustomNameplates;
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;

src/main/java/net/momirealms/customnameplates/command/BubblesCommand.java

@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands;
+package net.momirealms.customnameplates.command;
 
-import net.momirealms.customnameplates.commands.subcmd.*;
+import net.momirealms.customnameplates.command.subcmd.*;
 
 public class BubblesCommand extends AbstractMainCommand {
 

src/main/java/net/momirealms/customnameplates/command/NameplateCommand.java

@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands;
+package net.momirealms.customnameplates.command;
 
-import net.momirealms.customnameplates.commands.subcmd.*;
+import net.momirealms.customnameplates.command.subcmd.*;
 
 public class NameplateCommand extends AbstractMainCommand {
 

src/main/java/net/momirealms/customnameplates/command/subcmd/AboutCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;
 

src/main/java/net/momirealms/customnameplates/command/subcmd/BubblesEquipCommand.java

@@ -15,11 +15,11 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/command/subcmd/BubblesForceEquipCommand.java

@@ -15,11 +15,11 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.Bukkit;

src/main/java/net/momirealms/customnameplates/command/subcmd/BubblesForceUnequipCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.Bukkit;

src/main/java/net/momirealms/customnameplates/command/subcmd/BubblesListCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/command/subcmd/BubblesUnequipCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/command/subcmd/ForcePreviewCommand.java

@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.momirealms.customnameplates.CustomNameplates;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.manager.NameplateManager;
 import net.momirealms.customnameplates.object.nameplate.NameplateConfig;

src/main/java/net/momirealms/customnameplates/command/subcmd/HelpCommand.java

@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;
 

src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesEquipCommand.java

@@ -15,11 +15,11 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesForceEquipCommand.java

@@ -15,11 +15,11 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.Bukkit;

src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesForceUnequipCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.Bukkit;

src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesListCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesUnequipCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.api.CustomNameplatesAPI;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/command/subcmd/PreviewCommand.java

@@ -15,13 +15,13 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import net.momirealms.customnameplates.CustomNameplates;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.manager.NameplateManager;
 import net.momirealms.customnameplates.object.nameplate.NameplatesTeam;

src/main/java/net/momirealms/customnameplates/command/subcmd/ReloadCommand.java

@@ -15,10 +15,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.momirealms.customnameplates.commands.subcmd;
+package net.momirealms.customnameplates.command.subcmd;
 
 import net.momirealms.customnameplates.CustomNameplates;
-import net.momirealms.customnameplates.commands.AbstractSubCommand;
+import net.momirealms.customnameplates.command.AbstractSubCommand;
 import net.momirealms.customnameplates.manager.MessageManager;
 import net.momirealms.customnameplates.utils.AdventureUtils;
 import org.bukkit.command.CommandSender;

src/main/java/net/momirealms/customnameplates/manager/NameplateManager.java

@@ -1,6 +1,7 @@
 package net.momirealms.customnameplates.manager;
 
 import net.momirealms.customnameplates.CustomNameplates;
+import net.momirealms.customnameplates.api.CustomNameplatesAPI;
 import net.momirealms.customnameplates.object.ConditionalText;
 import net.momirealms.customnameplates.object.Function;
 import net.momirealms.customnameplates.object.SimpleChar;
@@ -225,7 +226,11 @@ public class NameplateManager extends Function {
         String current = getEquippedNameplate(player);
         if (!nameplate.equals(current)) {
             plugin.getDataManager().equipNameplate(player, nameplate);
-            Bukkit.getScheduler().runTaskLater(CustomNameplates.getInstance(), ()-> plugin.getDataManager().equipNameplate(player, current),this.getPreview_time() * 20);
+            CustomNameplatesAPI.getAPI().updateNameplateTeam(player);
+            Bukkit.getScheduler().runTaskLater(CustomNameplates.getInstance(), ()-> {
+                plugin.getDataManager().equipNameplate(player, current);
+                CustomNameplatesAPI.getAPI().updateNameplateTeam(player);
+            },this.getPreview_time() * 20);
         }
         showPlayerArmorStandTags(player);
     }