SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-12-08 19:20:05 +11:00
parent e3eb82a356
commit aacf3bd308
2 changed files with 26 additions and 33 deletions

View File

@@ -1,18 +1,6 @@
--- a/net/minecraft/world/item/ItemWorldMap.java
+++ b/net/minecraft/world/item/ItemWorldMap.java
@@ -33,6 +33,11 @@
import net.minecraft.world.level.material.MaterialMapColor;
import net.minecraft.world.level.saveddata.maps.WorldMap;
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.event.server.MapInitializeEvent;
+// CraftBukkit end
+
public class ItemWorldMap extends ItemWorldMapBase {
public static final int IMAGE_WIDTH = 128;
@@ -69,7 +74,7 @@
@@ -69,7 +69,7 @@
public static Integer getMapId(ItemStack itemstack) {
NBTTagCompound nbttagcompound = itemstack.getTag();
@@ -21,14 +9,3 @@
}
public static int createNewSavedData(World world, int i, int j, int k, boolean flag, boolean flag1, ResourceKey<World> resourcekey) {
@@ -77,6 +82,10 @@
int l = world.getFreeMapId();
world.setMapData(makeKey(l), worldmap);
+ // CraftBukkit start
+ MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ // CraftBukkit end
return l;
}