craftbukkit/nms-patches/net/minecraft/world/item/ItemWorldMap.patch

35 lines
1.3 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/item/ItemWorldMap.java
+++ b/net/minecraft/world/item/ItemWorldMap.java
2022-03-01 02:00:00 +11:00
@@ -32,6 +32,11 @@
2021-03-16 09:00:00 +11:00
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 {
2021-06-11 15:00:00 +10:00
public static final int IMAGE_WIDTH = 128;
2022-03-01 02:00:00 +11:00
@@ -66,7 +71,7 @@
2021-11-22 09:00:00 +11:00
public static Integer getMapId(ItemStack itemstack) {
2018-07-15 10:00:00 +10:00
NBTTagCompound nbttagcompound = itemstack.getTag();
2021-11-22 09:00:00 +11:00
- return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : null;
+ return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : -1; // CraftBukkit - make new maps for no tag
2016-11-17 12:41:03 +11:00
}
2021-07-07 00:00:00 +10:00
public static int createNewSavedData(World world, int i, int j, int k, boolean flag, boolean flag1, ResourceKey<World> resourcekey) {
2022-03-01 02:00:00 +11:00
@@ -74,6 +79,10 @@
2021-11-22 09:00:00 +11:00
int l = world.getFreeMapId();
2021-06-11 15:00:00 +10:00
2021-11-22 09:00:00 +11:00
world.setMapData(makeKey(l), worldmap);
2018-07-15 10:00:00 +10:00
+ // CraftBukkit start
+ MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ // CraftBukkit end
2021-06-11 15:00:00 +10:00
return l;
2018-07-15 10:00:00 +10:00
}