Fix NullPointerException when MOTD is null

CyberedCake · Jul 11, 2022 · b3f18a1 · b3f18a1
1 parent e02ded8
commit b3f18a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...src/main/java/net/cybercake/cyberapi/bungee/server/serverlist/ServerListInfoListener.java b/...src/main/java/net/cybercake/cyberapi/bungee/server/serverlist/ServerListInfoListener.java
@@ -53,6 +53,7 @@ private ServerPing handlePing(PendingConnection address, ServerPing ping) {
 
             // MOTD
             MOTD motd = (serverListPingEvent.getMOTD() == null ? MOTD.builder("default_temp").build() : serverListPingEvent.getMOTD());
+            if(motd == null) motd = MOTD.builder("_default").build();
             ping.setDescriptionComponent(UChat.bComponent(motd.getFormattedMOTD()));
             try {
                 Favicon image = null;

diff --git a/...src/main/java/net/cybercake/cyberapi/spigot/server/serverlist/ServerListInfoListener.java b/...src/main/java/net/cybercake/cyberapi/spigot/server/serverlist/ServerListInfoListener.java
@@ -55,6 +55,7 @@ private void handlePing(InetAddress address, WrappedServerPing ping) {
 
             // MOTD
             MOTD motd = serverListPingEvent.getMOTD();
+            if(motd == null) motd = MOTD.builder("_default").build();
             ping.setMotD(motd.getFormattedMOTD());
             WrappedServerPing.CompressedImage image = null;
             switch(motd.getMOTDIconType()) {