15hr WOO restriction check added.

2023-01-07 11:22:38 -05:00
parent 302358e31c
commit 4b5ce5bdb1
2 changed files with 16 additions and 3 deletions
@@ -36,12 +36,12 @@ import engine.net.client.msg.UpdateClientAlliancesMsg;
 import engine.net.client.msg.guild.GuildInfoMsg;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
-import org.joda.time.LocalDateTime;
 import org.pmw.tinylog.Logger;

 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -82,7 +82,7 @@ public class Guild extends AbstractWorldObject {
 	private String hash;
 	private boolean ownerIsNPC;

-	public Timestamp lastWooEditTime;
+	public LocalDateTime lastWooEditTime;
 	public HashMap<Integer,GuildAlliances> guildAlliances = new HashMap<>();

 	/**
@@ -180,7 +180,12 @@ public class Guild extends AbstractWorldObject {
 		this.teleportMax = rs.getInt("teleportMax");

 		this.mineTime = rs.getInt("mineTime");
-		this.lastWooEditTime = rs.getTimestamp("lastWooEditTime");
+
+		Timestamp lastWooRequest = rs.getTimestamp("lastWooEditTime");
+
+		if (lastWooRequest != null)
+			this.lastWooEditTime = lastWooRequest.toLocalDateTime();
+
 		this.hash = rs.getString("hash");
 	}