Black Hole / CraftBukkit / 28229e38822

Commits

md_5 authored 28229e38822 26 Mar 2025

Prevent plugins setting scoreboard team colours to formatting codes

Modified


75 75
76 76	@Override
77 77	public ChatColor getColor() {
78 78	checkState();
79 79
80 80	return CraftChatMessage.getColor(team.getColor());
81 81	}
82 82
83 83	@Override
84 84	public void setColor(ChatColor color) {
85 -	Preconditions.checkArgument(color != null, "Color cannot be null");
85 +	Preconditions.checkArgument(color != null && !color.isFormat(), "Color cannot be null or a format");
86 86	checkState();
87 87
88 88	team.setColor(CraftChatMessage.getColor(color));
89 89	}
90 90
91 91	@Override
92 92	public boolean allowFriendlyFire() {
93 93	checkState();
94 94
95 95	return team.isAllowFriendlyFire();