2023-09-24 20:17:29 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Sun, 24 Sep 2023 18:35:28 +0200
Subject: [PATCH] Fix missing map initialize event call
2023-12-08 20:00:39 +01:00
== AT ==
public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
2023-09-24 20:17:29 +02:00
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
2024-04-25 22:34:46 +02:00
index b8aac1c72bac15bf421d0f7ae406feefe1cad587..601ddb8a2ed1559a3c439c1aca49f772ffdd092a 100644
2023-09-24 20:17:29 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
2024-04-25 21:40:53 +02:00
@@ -1670,13 +1670,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
2023-09-24 20:17:29 +02:00
@Nullable
@Override
2024-04-25 00:36:49 +02:00
public MapItemSavedData getMapData(MapId id) {
2023-12-08 20:00:39 +01:00
- // CraftBukkit start
2024-04-25 00:36:49 +02:00
- MapItemSavedData worldmap = (MapItemSavedData) this.getServer().overworld().getDataStorage().get(MapItemSavedData.factory(), id.key());
2023-12-08 20:00:39 +01:00
- if (worldmap != null) {
- worldmap.id = id;
2024-01-13 18:34:33 +01:00
+ // Paper start - Call missing map initialize event and set id
2023-09-24 20:17:29 +02:00
+ final DimensionDataStorage storage = this.getServer().overworld().getDataStorage();
+
2024-04-25 22:34:46 +02:00
+ final net.minecraft.world.level.saveddata.SavedData existing = storage.cache.get(id.key());
+ if (existing == null && !storage.cache.containsKey(id.key())) {
2024-04-25 00:36:49 +02:00
+ final MapItemSavedData worldmap = (MapItemSavedData) this.getServer().overworld().getDataStorage().get(MapItemSavedData.factory(), id.key());
2024-04-25 22:34:46 +02:00
+ storage.cache.put(id.key(), worldmap);
+ if (worldmap != null) {
+ worldmap.id = id;
+ new MapInitializeEvent(worldmap.mapView).callEvent();
+ return worldmap;
2023-09-24 20:17:29 +02:00
+ }
2023-12-08 20:00:39 +01:00
+ } else if (existing instanceof MapItemSavedData mapItemSavedData) {
+ mapItemSavedData.id = id;
}
- return worldmap;
- // CraftBukkit end
2023-09-24 20:17:29 +02:00
+
+ return existing instanceof MapItemSavedData data ? data : null;
2024-01-13 18:34:33 +01:00
+ // Paper end - Call missing map initialize event and set id
2023-09-24 20:17:29 +02:00
}
@Override