Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>

paper-server/nms-patches/net/minecraft/world/item/ItemWorldMap.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/ItemWorldMap.java
 +++ b/net/minecraft/world/item/ItemWorldMap.java
-@@ -34,6 +34,11 @@
+@@ -33,6 +33,11 @@
  import net.minecraft.world.level.material.MaterialMapColor;
  import net.minecraft.world.level.saveddata.maps.WorldMap;
  
@@ -12,19 +12,19 @@
  public class ItemWorldMap extends ItemWorldMapBase {
  
      public static final int IMAGE_WIDTH = 128;
-@@ -68,7 +73,7 @@
-     public static Integer d(ItemStack itemstack) {
+@@ -67,7 +72,7 @@
+     public static Integer getMapId(ItemStack itemstack) {
          NBTTagCompound nbttagcompound = itemstack.getTag();
  
--        return nbttagcompound != null && nbttagcompound.hasKeyOfType("map", 99) ? nbttagcompound.getInt("map") : null;
-+        return nbttagcompound != null && nbttagcompound.hasKeyOfType("map", 99) ? nbttagcompound.getInt("map") : -1; // CraftBukkit - make new maps for no tag
+-        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
      }
  
      public static int createNewSavedData(World world, int i, int j, int k, boolean flag, boolean flag1, ResourceKey<World> resourcekey) {
-@@ -76,6 +81,10 @@
-         int l = world.getWorldMapCount();
+@@ -75,6 +80,10 @@
+         int l = world.getFreeMapId();
  
-         world.a(a(l), worldmap);
+         world.setMapData(makeKey(l), worldmap);
 +        // CraftBukkit start
 +        MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView);
 +        Bukkit.getServer().getPluginManager().callEvent(event);