mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

More more compile fixes

Browse source
This commit is contained in:
Nassim Jahnke 2024-04-25 22:34:46 +02:00
parent d01f6b2fd2
commit 8d3759d4a5
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
121 changed files with 193 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

16
patches/server/0920-Fix-missing-map-initialize-event-call.patch
View file

@ -7,7 +7,7 @@ Subject: [PATCH] Fix missing map initialize event call
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;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index b8aac1c72bac15bf421d0f7ae406feefe1cad587..91ef138bdd0bfe77692353e7598b47a43511eb3b 100644
index b8aac1c72bac15bf421d0f7ae406feefe1cad587..601ddb8a2ed1559a3c439c1aca49f772ffdd092a 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1670,13 +1670,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -21,14 +21,14 @@ index b8aac1c72bac15bf421d0f7ae406feefe1cad587..91ef138bdd0bfe77692353e7598b47a4
+ // Paper start - Call missing map initialize event and 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 existing = storage.cache.get(id.key());
+ if (existing == null && !storage.cache.containsKey(id.key())) {
+ final MapItemSavedData worldmap = (MapItemSavedData) this.getServer().overworld().getDataStorage().get(MapItemSavedData.factory(), id.key());
+ storage.cache.put(id, map);
+ if (map != null) {
+ map.id = id;
+ new MapInitializeEvent(map.mapView).callEvent();
+ return map;
+ storage.cache.put(id.key(), worldmap);
+ if (worldmap != null) {
+ worldmap.id = id;
+ new MapInitializeEvent(worldmap.mapView).callEvent();
+ return worldmap;
+ }
+ } else if (existing instanceof MapItemSavedData mapItemSavedData) {
+ mapItemSavedData.id = id;