From 71344197385a70455232ef28c77829548767b528 Mon Sep 17 00:00:00 2001
From: coooookies <1164557342@qq.com>
Date: Tue, 3 May 2022 22:10:07 +0800
Subject: [PATCH] fix: Mail can't be sent to Offline player

---
 .../io/github/gmw/module/PluginCommand.java   | 16 ++++++---
 .../java/io/github/gmw/utils/MailCore.java    | 35 +++++++++++++++++--
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/github/gmw/module/PluginCommand.java b/src/main/java/io/github/gmw/module/PluginCommand.java
index 471e989..20025bb 100644
--- a/src/main/java/io/github/gmw/module/PluginCommand.java
+++ b/src/main/java/io/github/gmw/module/PluginCommand.java
@@ -73,11 +73,17 @@ public class PluginCommand implements CommandHandler {
 
                         int uid = Integer.parseInt(args.get(2));
                         CommandHandler.sendMessage(sender, "Mail Sending...");
-                        Grasscutter.getGameServer().getPlayers().forEach((index, player) -> {
-                            if (player.getUid() == uid) {
-                                MailCore.sendMailToPlayer(player, template);
-                            }
-                        });
+                        MailCore.sendMailToPlayer(uid, template, false);
+                    }
+                    case "sendonline" -> {
+                        if (template == null) {
+                            CommandHandler.sendMessage(sender, "Invalid template id.");
+                            return;
+                        }
+
+                        int uid = Integer.parseInt(args.get(2));
+                        CommandHandler.sendMessage(sender, "Mail Sending...");
+                        MailCore.sendMailToPlayer(uid, template, true);
                     }
                     case "sendall" -> {
                         if (template == null) {
diff --git a/src/main/java/io/github/gmw/utils/MailCore.java b/src/main/java/io/github/gmw/utils/MailCore.java
index 54ac103..c80b9c6 100644
--- a/src/main/java/io/github/gmw/utils/MailCore.java
+++ b/src/main/java/io/github/gmw/utils/MailCore.java
@@ -12,11 +12,42 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 
 public final class MailCore {
+    public static void saveMailToDatabase(Player player, MeaMailTemplate template) {
+        saveMailToDatabase(player, template, 0);
+    }
+
+    public static void saveMailToDatabase(Player player, MeaMailTemplate template, int minLevel) {
+        if (player.getLevel() < minLevel) return;
+
+        Mail mail = templateToMail(template);
+        mail.setOwnerUid(player.getUid());
+        DatabaseHelper.saveMail(mail);
+        MeaMailPlusCore.getInstance().logger("Mail sent to " + player.getUid() + "(Offline): " + template.title);
+    }
+
+    public static void sendMailToPlayer(int uid, MeaMailTemplate template, boolean onlineOnly) {
+        AtomicBoolean mailSent = new AtomicBoolean(false);
+        Grasscutter.getGameServer().getPlayers().forEach((index, player) -> {
+            if (player.getUid() == uid) {
+                mailSent.set(true);
+                sendMailToPlayer(player, template);
+            }
+        });
+
+        if(!onlineOnly && !mailSent.get()) {
+            DatabaseHelper.getAllPlayers().forEach(player -> {
+                if (player.getUid() == uid) {
+                    saveMailToDatabase(player, template);
+                }
+            });
+        }
+    }
+
     public static void sendMailToPlayer(Player player, MeaMailTemplate template) {
         sendMailToPlayer(player, template, 0);
     }
@@ -112,7 +143,7 @@ public final class MailCore {
 
         // two methods to send mail
         onlinePlayers.forEach(player -> sendMailToPlayer(player, template, minLevel));
-        offlinePlayers.forEach(player -> sendMailToPlayer(player, template, minLevel));
+        offlinePlayers.forEach(player -> saveMailToDatabase(player, template, minLevel));
     }
 
     public static void sendDailySignInMailToPlayer(int uid) {