Msons are immutable, so reuse them

MassiveCraft · Nov 8, 2017 · 81ca676 · 81ca676
1 parent fa9c320
commit 81ca676
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java
@@ -50,6 +50,9 @@ public class Mson implements Serializable
 	public static final transient Mson EMPTY = mson("");
 	public static final transient Mson NEWLINE = mson("\n");
 	public static final transient Mson DOT = mson(".");
+	public static final transient Mson NULL = mson("NULL");
+	public static final transient Mson SPACE_AND_SPACE = mson(" and ");
+	public static final transient Mson COMMA_SPACE = mson(", ");
 
 	// -------------------------------------------- //
 	// GSON
@@ -1082,7 +1085,7 @@ public static Mson implode(final Object[] list, final Mson glue, final Mson form
 		for (int i = 0; i < list.length; i++)
 		{
 			Object item = list[i];
-			Mson part = (item == null ? mson("NULL") : Mson.mson(item));
+			Mson part = (item == null ? NULL : Mson.mson(item));
 
 			if (i != 0)
 			{
@@ -1145,11 +1148,11 @@ public static Mson implodeCommaAnd(final Collection<?> objects, Mson comma, Mson
 	}
 	public static Mson implodeCommaAndDot(final Collection<?> objects, ChatColor color)
 	{
-		return implodeCommaAndDot(objects, mson(", ").color(color), mson(" and ").color(color), mson(".").color(color));
+		return implodeCommaAndDot(objects, COMMA_SPACE.color(color), SPACE_AND_SPACE.color(color), DOT.color(color));
 	}
 	public static Mson implodeCommaAnd(final Collection<?> objects, ChatColor color)
 	{
-		return implodeCommaAndDot(objects, mson(", ").color(color), mson(" and ").color(color), mson());
+		return implodeCommaAndDot(objects, COMMA_SPACE.color(color), SPACE_AND_SPACE.color(color), mson());
 	}
 	public static Mson implodeCommaAndDot(final Collection<?> objects)
 	{