ConfigManager: Fix NPE when resetting configs with null default

2020-10-24 22:52:44 +02:00
parent 8438b42e15
commit 03566d6702
3 changed files with 32 additions and 2 deletions
@@ -659,6 +659,7 @@ public class ConfigManager
 		return str;
 	}

+	@Nullable
 	static String objectToString(Object object)
 	{
 		if (object instanceof Color)
@@ -702,7 +703,7 @@ public class ConfigManager
 		{
 			return Long.toString(((Duration) object).toMillis());
 		}
-		return object.toString();
+		return object == null ? null : object.toString();
 	}

 	@Subscribe(priority = 100)