From 15d2795686b6abbdbd0d2e078dac93f620a8f75b Mon Sep 17 00:00:00 2001 From: mingjun97 Date: Sat, 30 Apr 2022 22:30:47 -0700 Subject: [PATCH] Should fix all crashes when login for iOS client --- .../java/emu/grasscutter/server/dispatch/DispatchServer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java index 5ef8f7a89..1a59cb9ad 100644 --- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java +++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java @@ -346,6 +346,9 @@ public final class DispatchServer { responseData.data.account.uid = account.getId(); responseData.data.account.token = account.generateSessionKey(); responseData.data.account.email = account.getEmail(); + if (responseData.data.account.email == null) { + responseData.data.account.email = ""; + } Grasscutter.getLogger().info(String.format("[Dispatch] Client %s logged in as %s", req.ip(), responseData.data.account.uid));