From 2a7e69e281bc500a00bfe84fa8a2bff24b8ecddd Mon Sep 17 00:00:00 2001
From: BrainStone <yannick@tedworld.de>
Date: Fri, 23 Jul 2021 00:35:40 +0200
Subject: [PATCH] Move timestamp logic into a safe place

---
 DynmapCore/src/main/java/org/dynmap/DynmapWorld.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DynmapCore/src/main/java/org/dynmap/DynmapWorld.java b/DynmapCore/src/main/java/org/dynmap/DynmapWorld.java
index 9e7fb453..7a297537 100644
--- a/DynmapCore/src/main/java/org/dynmap/DynmapWorld.java
+++ b/DynmapCore/src/main/java/org/dynmap/DynmapWorld.java
@@ -155,11 +155,12 @@ public abstract class DynmapWorld {
             }
             try {
                 MapStorageTile.TileRead tr = tile1.read();
-                mostRecentTimestamp = Math.max(mostRecentTimestamp, tr.lastModified);
                 if (tr != null) {
                     BufferedImage im = null;
                     try {
                         im = ImageIOManager.imageIODecode(tr);
+                        // Only consider the timestamp when the tile exists and isn't broken
+                        mostRecentTimestamp = Math.max(mostRecentTimestamp, tr.lastModified);
                     } catch (IOException iox) {
                         // Broken file - zap it
                         tile1.delete();