TheCreeperCow / CraftBukkit / 6b95d595cf8

Commits

md_5 authored 6b95d595cf8 18 Jul 2020

SPIGOT-6001: Hex colors format differently to traditional colours

Modified


80 80	case 1:
81 81	char c = match.toLowerCase(java.util.Locale.ENGLISH).charAt(1);
82 82	EnumChatFormat format = formatMap.get(c);
83 83
84 84	if (c == 'x') {
85 85	hex = new StringBuilder("#");
86 86	} else if (hex != null) {
87 87	hex.append(c);
88 88
89 89	if (hex.length() == 7) {
90 -	modifier = modifier.setColor(ChatHexColor.a(hex.toString()));
90 +	modifier = RESET.setColor(ChatHexColor.a(hex.toString()));
91 91	hex = null;
92 92	}
93 93	} else if (format.isFormat() && format != EnumChatFormat.RESET) {
94 94	switch (format) {
95 95	case BOLD:
96 96	modifier = modifier.setBold(Boolean.TRUE);
97 97	break;
98 98	case ITALIC:
99 99	modifier = modifier.setItalic(Boolean.TRUE);
100 100	break;