From 988fe600cefc9b946be0fc756db038b0d739c1d9 Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Fri, 7 Jan 2022 00:51:15 +0800
Subject: [PATCH] =?UTF-8?q?[v1.2.2]=20=E7=89=88=E6=9C=AC=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20-=20[F]=20=E4=BF=AE=E5=A4=8D=20getDateInt()=20=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  2 +-
 .../cc/carm/plugin/ultradepository/data/UserData.java  |  2 +-
 .../carm/plugin/ultradepository/util/DateIntUtil.java  | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 167c3c0..964ddfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>cc.carm.plugin</groupId>
     <artifactId>ultradepository</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <name>UltraDepository</name>
     <description>超级仓库插件，支持设定不同物品的存储仓库。</description>
diff --git a/src/main/java/cc/carm/plugin/ultradepository/data/UserData.java b/src/main/java/cc/carm/plugin/ultradepository/data/UserData.java
index f6865e1..ac4cf4f 100644
--- a/src/main/java/cc/carm/plugin/ultradepository/data/UserData.java
+++ b/src/main/java/cc/carm/plugin/ultradepository/data/UserData.java
@@ -117,7 +117,7 @@ public class UserData {
 
 
 	public Date getDate() {
-		return new Date(DateIntUtil.getDateMillis(getDateInt()));
+		return DateIntUtil.getDate(getDateInt());
 	}
 
 	public int getDateInt() {
diff --git a/src/main/java/cc/carm/plugin/ultradepository/util/DateIntUtil.java b/src/main/java/cc/carm/plugin/ultradepository/util/DateIntUtil.java
index 3c79ba6..863e0f2 100644
--- a/src/main/java/cc/carm/plugin/ultradepository/util/DateIntUtil.java
+++ b/src/main/java/cc/carm/plugin/ultradepository/util/DateIntUtil.java
@@ -22,10 +22,14 @@ public class DateIntUtil {
 	}
 
 	public static long getDateMillis(int dateInt) {
+		return getDate(dateInt).getTime();
+	}
+
+	public static Date getDate(int dateInt) {
 		try {
-			return getFormat().parse(Integer.toString(dateInt)).getTime();
-		} catch (ParseException e) {
-			return System.currentTimeMillis();
+			return (Date) getFormat().parse(Integer.toString(dateInt));
+		} catch (ParseException | NumberFormatException e) {
+			return new Date(System.currentTimeMillis());
 		}
 	}