From 3553dff6f336f14d1a8d59a1657fbe9f30917000 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 13 Jun 2018 15:43:40 +0300 Subject: [PATCH] =?UTF-8?q?Text=20style:=20RESET=20=D0=B8=20(concat=20->?= =?UTF-8?q?=20merge)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/text/TextStyle.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/mc/core/text/TextStyle.java b/core/src/main/java/mc/core/text/TextStyle.java index 1a90e8c..24b8552 100644 --- a/core/src/main/java/mc/core/text/TextStyle.java +++ b/core/src/main/java/mc/core/text/TextStyle.java @@ -18,6 +18,7 @@ public class TextStyle { public static final TextStyle UNDERLINE = new TextStyle(null, null, true, null, null); public static final TextStyle STRIKETHOUGH = new TextStyle(null, null, null, true, null); public static final TextStyle OBFUSCATED = new TextStyle(null, null, null, null, true); + public static final TextStyle RESET = new TextStyle(false, false, false, false, false); private static class OptionalBoolean { private static final Optional TRUE = Optional.of(true); @@ -54,7 +55,7 @@ public class TextStyle { this.obfuscated = OptionalBoolean.of(obfuscated); } - public void concat(TextStyle style) { + public void merge(TextStyle style) { if (style.bold.isPresent()) this.bold = style.bold; if (style.italic.isPresent()) this.italic = style.italic; if (style.underline.isPresent()) this.underline = style.underline;