From 13884a0748fdbc66b7a70780473b08ceef5c1f4a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 4 Oct 2023 16:25:26 +0100
Subject: [PATCH] Quick tweaks to logical flow of getMapData

---
 patches/server/Fix-missing-map-initialize-event-call.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/Fix-missing-map-initialize-event-call.patch b/patches/server/Fix-missing-map-initialize-event-call.patch
index 5b97f09ace..df6edad405 100644
--- a/patches/server/Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/Fix-missing-map-initialize-event-call.patch
@@ -20,12 +20,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (existing == null && !storage.cache.containsKey(id)) {
 +            final net.minecraft.world.level.saveddata.SavedData.Factory<MapItemSavedData> factory = MapItemSavedData.factory();
 +            final MapItemSavedData map = storage.readSavedData(factory.deserializer(), factory.type(), id);
++            storage.cache.put(id, map);
 +            if (map != null) {
 +                map.id = id;
 +                new MapInitializeEvent(map.mapView).callEvent();
++                return map;
 +            }
-+
-+            storage.cache.put(id, map);
 +        }
 +
 +        return existing instanceof MapItemSavedData data ? data : null;