From ade9deec47440110338fa623b1872b434ed7c34e Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Fri, 21 Aug 2020 00:10:34 -0400
Subject: [PATCH] Fix recent PR not loading default messages from config
 correctly.

---
 .../proxy/config/VelocityConfiguration.java   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
index ec15d8b22..6c0eb26ec 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
@@ -837,38 +837,42 @@ public class VelocityConfiguration implements ProxyConfig {
     }
 
     private String getString(String path) {
-      return toml.getOrElse(path, defaultToml.getOrElse(path, ""));
+      String def = defaultToml.getOrElse(path, "");
+      if (toml == null) {
+        return def;
+      }
+      return toml.getOrElse(path, def);
     }
 
     public Component getKickPrefix(String server) {
-      return serialize(String.format(kickPrefix, server));
+      return deserialize(String.format(kickPrefix, server));
     }
 
     public Component getDisconnectPrefix(String server) {
-      return serialize(String.format(disconnectPrefix, server));
+      return deserialize(String.format(disconnectPrefix, server));
     }
 
     public Component getOnlineModeOnly() {
-      return serialize(onlineModeOnly);
+      return deserialize(onlineModeOnly);
     }
 
     public Component getNoAvailableServers() {
-      return serialize(noAvailableServers);
+      return deserialize(noAvailableServers);
     }
 
     public Component getAlreadyConnected() {
-      return serialize(alreadyConnected);
+      return deserialize(alreadyConnected);
     }
 
     public Component getMovedToNewServerPrefix() {
-      return serialize(movedToNewServerPrefix);
+      return deserialize(movedToNewServerPrefix);
     }
 
     public Component getGenericConnectionError() {
-      return serialize(genericConnectionError);
+      return deserialize(genericConnectionError);
     }
 
-    private Component serialize(String str) {
+    private Component deserialize(String str) {
       if (str.startsWith("{")) {
         return GsonComponentSerializer.gson().deserialize(str);
       }