lastRaidTime primitive

darksaid98 · Apr 18, 2023 · 16add93 · 16add93
1 parent c2595bc
commit 16add93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/me/ShermansWorld/AlathraWar/War.java b/src/main/java/me/ShermansWorld/AlathraWar/War.java
@@ -22,7 +22,7 @@ public class War {
     // References
     private ArrayList<Siege> sieges = new ArrayList<Siege>();
     private ArrayList<Raid> raids = new ArrayList<Raid>();
-    private Long lastRaidTime = 0L;
+    private long lastRaidTime = 0L;
 
     /**
      * War Constructor
@@ -213,10 +213,7 @@ public void setLastRaidTime(Long lastRaidTime) {
         this.lastRaidTime = lastRaidTime;
     }
 
-    public Long getLastRaidTime() {
-        if(lastRaidTime == null) {
-            lastRaidTime = 0L;
-        }
+    public long getLastRaidTime() {
         return this.lastRaidTime;
     }
 }
diff --git a/src/main/java/me/ShermansWorld/AlathraWar/data/RaidData.java b/src/main/java/me/ShermansWorld/AlathraWar/data/RaidData.java
@@ -228,7 +228,7 @@ public static int isValidRaid(War war, @Nonnull Town town) {
             return -1;
         }
 
-        Long lastRaidTime = war.getLastRaidTime();
+        long lastRaidTime = war.getLastRaidTime();
         //6 hour raid cooldown for war
         if ((System.currentTimeMillis() / 1000) - lastRaidTime <= 21600) {
             return 0;