From 7c5c0e21b75fbd30ed121c7945542eca27e897cd Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Thu, 30 Oct 2025 08:12:21 -0700
Subject: [PATCH] Fix null pointer error when claiming mail

---
 .../emu/nebula/server/handlers/HandlerMailRecvReq.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/nebula/server/handlers/HandlerMailRecvReq.java b/src/main/java/emu/nebula/server/handlers/HandlerMailRecvReq.java
index 42f673d..6e0f41a 100644
--- a/src/main/java/emu/nebula/server/handlers/HandlerMailRecvReq.java
+++ b/src/main/java/emu/nebula/server/handlers/HandlerMailRecvReq.java
@@ -24,10 +24,10 @@ public class HandlerMailRecvReq extends NetHandler {
         var rsp = MailRecvResp.newInstance()
                 .setItems(changes.toProto());
         
-        var recvList = (IntList) changes.getExtraData();
-        
-        for (int id : recvList) {
-            rsp.addIds(id);
+        // Add mail ids that we received
+        if (changes.getExtraData() != null) {
+            var recvList = (IntList) changes.getExtraData();
+            recvList.forEach(rsp::addIds);
         }
         
         return this.encodeMsg(NetMsgId.mail_recv_succeed_ack, rsp);