Merge remote-tracking branch 'origin/minetime_bugfix' into post-wipe-merge

2023-01-08 07:07:12 -05:00
parent f979a7b694 df09b6e38b
commit e9850a51bc
7 changed files with 138 additions and 64 deletions
@@ -40,7 +40,10 @@ 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;
 import java.util.concurrent.ConcurrentHashMap;

@@ -79,6 +82,7 @@ public class Guild extends AbstractWorldObject {
 	private String hash;
 	private boolean ownerIsNPC;

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

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

 		this.mineTime = rs.getInt("mineTime");
-		this.hash = rs.getString("hash");

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

 	public void setNation(Guild nation) {