49 Zeilen
2.6 KiB
Diff
49 Zeilen
2.6 KiB
Diff
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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
index 8a4f727cc538a47c437c2aa17999f197253adbde..3820d1d79f445eb85ecab51fdcc74e62a1503636 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@@ -2129,7 +2129,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
@Nullable
|
|
@Override
|
|
public MapItemSavedData getMapData(String id) {
|
|
- return (MapItemSavedData) this.getServer().overworld().getDataStorage().get(MapItemSavedData.factory(), id);
|
|
+ // Paper start - Call missing map initialize event & set id
|
|
+ final DimensionDataStorage storage = this.getServer().overworld().getDataStorage();
|
|
+
|
|
+ final net.minecraft.world.level.saveddata.SavedData existing = storage.cache.get(id);
|
|
+ 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;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return existing instanceof MapItemSavedData data ? data : null;
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
|
|
index 1aea6a257ffceb511368a6e8dee5051e120894ad..269c81cd60d98a94721c77d700af223bda15a61a 100644
|
|
--- a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
|
|
+++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
|
|
@@ -58,7 +58,7 @@ public class DimensionDataStorage {
|
|
}
|
|
|
|
@Nullable
|
|
- private <T extends SavedData> T readSavedData(Function<CompoundTag, T> readFunction, DataFixTypes dataFixTypes, String id) {
|
|
+ public <T extends SavedData> T readSavedData(Function<CompoundTag, T> readFunction, DataFixTypes dataFixTypes, String id) { // Paper
|
|
try {
|
|
File file = this.getDataFile(id);
|
|
if (file.exists()) {
|