diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/score/BukkitTeamManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/score/BukkitTeamManager.java index 091d79377..a70f18349 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/score/BukkitTeamManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/score/BukkitTeamManager.java @@ -38,7 +38,7 @@ public class BukkitTeamManager implements TeamManager { Object scoreboard = FastNMS.INSTANCE.field$MinecraftServer$scoreboard(); List packets = new ObjectArrayList<>(); for (LegacyChatFormatter color : LegacyChatFormatter.values()) { - String teamName = TEAM_PREFIX + color.name().toLowerCase(Locale.ROOT) + "_" + UUID.randomUUID(); + String teamName = TeamManager.createTeamName(color); Object team = FastNMS.INSTANCE.constructor$PlayerTeam(scoreboard, teamName); FastNMS.INSTANCE.method$PlayerTeam$setColor(team, color.name()); this.teamByColor.put(color, team); diff --git a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/Furniture.java b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/Furniture.java index a3659e63d..fb28c47b0 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/Furniture.java +++ b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/Furniture.java @@ -117,11 +117,11 @@ public abstract class Furniture implements Cullable { Seat[] seats = hitbox.seats(); for (int index = 0; index < seats.length; index++) { Map> tempMap = seatMap.get(); - Vector3f seatPos = seats[i].config().position(); + Vector3f seatPos = seats[index].config().position(); if (tempMap.containsKey(seatPos)) { - seats[i] = tempMap.get(seatPos); + seats[index] = tempMap.get(seatPos); } else { - tempMap.put(seatPos, seats[i]); + tempMap.put(seatPos, seats[index]); } } hitbox.collectVirtualEntityId(virtualEntityIds::addLast); diff --git a/core/src/main/java/net/momirealms/craftengine/core/world/score/TeamManager.java b/core/src/main/java/net/momirealms/craftengine/core/world/score/TeamManager.java index 3b0243b63..357ddca95 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/world/score/TeamManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/world/score/TeamManager.java @@ -3,10 +3,15 @@ package net.momirealms.craftengine.core.world.score; import net.momirealms.craftengine.core.plugin.Manageable; import net.momirealms.craftengine.core.util.LegacyChatFormatter; +import java.util.Locale; + public interface TeamManager extends Manageable { - String TEAM_PREFIX = "craftengine_"; Object getTeamByColor(LegacyChatFormatter color); Object addTeamsPacket(); + + static String createTeamName(LegacyChatFormatter color) { + return "\ufeffce_" + color.name().toLowerCase(Locale.ROOT) + "\ufeff"; + } }