Repo-Mirror/Custom-Nameplates
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Nameplates.git synced 2026-01-06 15:42:00 +00:00
Code Issues Releases Activity

add prefix to team

Browse Source
This commit is contained in:
XiaoMoMi
2024-08-30 15:58:20 +08:00
parent 886a3c53a3
commit f597e584ee
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper/src/main/java/net/momirealms/customnameplates/paper/CustomNameplatesPluginImpl.java
View File

@@ -51,6 +51,7 @@ import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.scoreboard.Team;
import java.io.File;
import java.util.ArrayList;
@@ -143,6 +144,11 @@ public class CustomNameplatesPluginImpl extends CustomNameplatesPlugin implement
if (storageManager != null) ((StorageManagerImpl) this.storageManager).disable();
if (adventureManager != null) ((AdventureManagerImpl) this.adventureManager).close();
if (versionManager != null) HandlerList.unregisterAll((VersionManagerImpl) versionManager);
for (Team team : Bukkit.getScoreboardManager().getMainScoreboard().getTeams()) {
if (team.getName().startsWith("CNP_")) {
team.unregister();
}
}
}
@Override

4
paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/team/TeamManagerImpl.java
View File

@@ -70,7 +70,7 @@ public class TeamManagerImpl implements TeamManager, PluginMessageListener {
if (CNConfig.disableTeamManage) return;
if (CNConfig.isOtherTeamPluginHooked()) return;
String team = teamProvider.getTeam(player, null);
if (!team.equals(player.getName())) return;
if (!team.equals("CNP_" + player.getName())) return;
// if (CNConfig.createRealTeam) {
Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
Team playerTeam = scoreboard.getTeam(team);
@@ -121,7 +121,7 @@ public class TeamManagerImpl implements TeamManager, PluginMessageListener {
if (CNConfig.isOtherTeamPluginHooked()) return;
String team = teamProvider.getTeam(player, null);
// If the team is created by other plugins
if (!team.equals(player.getName())) return;
if (!team.equals("CNP_" + player.getName())) return;
// if (CNConfig.createRealTeam) {
Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
Optional.ofNullable(scoreboard.getTeam(team)).ifPresent(Team::unregister);

2
paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/team/provider/DefaultProvider.java
View File

@@ -29,7 +29,7 @@ public class DefaultProvider implements TeamProvider {
Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
Team team = scoreboard.getPlayerTeam(player);
if (team == null) {
return player.getName();
return "CNP_" + player.getName();
}
return team.getName();
}