Cynthia Yantis / Bukkit / 818cf8fdab5

Commits

Cynthia Yantis authored 818cf8fdab5 Merge 24 Jul 2024

Merge branch 'master' into feature/new-armor-events

# Conflicts:
#	src/main/java/org/bukkit/inventory/EquipmentSlot.java

Modified


18 18	/**
19 19	* Challenge icons have a stylised icon frame.
20 20	*/
21 21	CHALLENGE(ChatColor.DARK_PURPLE),
22 22	/**
23 23	* Goal icons have a rounded icon frame.
24 24	*/
25 25	GOAL(ChatColor.GREEN);
26 26	private final ChatColor color;
27 27
28 -	private AdvancementDisplayType(@NotNull ChatColor color) {
28 +	private AdvancementDisplayType(ChatColor color) {
29 29	this.color = color;
30 30	}
31 31
32 32	/**
33 33	* The chat color used by Minecraft for this advancement.
34 34	*
35 35	* @return The chat color used by this advancement type.
36 36	*/
37 37	@NotNull
38 38	public ChatColor getColor() {