fix: add support for MMM d, yyyy, HH:mm:ss format

titivermeesch · Jul 7, 2024 · 74ea636 · 74ea636
1 parent a6fb140
commit 74ea636
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.7.1'
+version = '8.7.2'
 description = 'CommandTimer'
 
 repositories {
@@ -61,7 +61,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.7.1'
+            version = '8.7.2'
 
             from components.java
         }

diff --git a/java8-build.gradle b/java8-build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.7.1'
+version = '8.7.2'
 description = 'CommandTimer'
 
 repositories {
@@ -69,7 +69,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.7.1'
+            version = '8.7.2'
 
             from components.java
         }

diff --git a/src/main/java/me/playbosswar/com/utils/gson/GsonDate.java b/src/main/java/me/playbosswar/com/utils/gson/GsonDate.java
@@ -27,7 +27,12 @@ public Date deserialize(JsonElement jsonElement, Type type,
                     SimpleDateFormat oldFormatter = new SimpleDateFormat("MMM d, yyyy, HH:mm:ss a");
                     return oldFormatter.parse(jsonElement.getAsString());
                 } catch(ParseException ex3) {
-                    throw new JsonParseException(ex3);
+                    try {
+                        SimpleDateFormat oldFormatter = new SimpleDateFormat("MMM d, yyyy, HH:mm:ss");
+                        return oldFormatter.parse(jsonElement.getAsString());
+                    } catch(ParseException ex4) {
+                        throw new JsonParseException(ex4);
+                    }
                 }
             }
         }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: me.playbosswar.com.CommandTimerPlugin
 name: "CommandTimer"
-version: "8.7.1"
+version: "8.7.2"
 description: "Schedule commands like you want"
 author: PlayBossWar
 api-version: 1.13