mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
--- a/net/minecraft/server/ItemMapEmpty.java
|
|
+++ b/net/minecraft/server/ItemMapEmpty.java
|
|
@@ -7,16 +7,20 @@
|
|
}
|
|
|
|
public InteractionResultWrapper<ItemStack> a(ItemStack itemstack, World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
- ItemStack itemstack1 = new ItemStack(Items.FILLED_MAP, 1, world.b("map"));
|
|
+ World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
|
|
+ ItemStack itemstack1 = new ItemStack(Items.FILLED_MAP, 1, worldMain.b("map")); // CraftBukkit - use primary world for maps
|
|
String s = "map_" + itemstack1.getData();
|
|
WorldMap worldmap = new WorldMap(s);
|
|
|
|
- world.a(s, (PersistentBase) worldmap);
|
|
+ worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit
|
|
worldmap.scale = 0;
|
|
worldmap.a(entityhuman.locX, entityhuman.locZ, worldmap.scale);
|
|
- worldmap.map = (byte) world.worldProvider.getDimensionManager().getDimensionID();
|
|
+ worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - use bukkit dimension
|
|
worldmap.track = true;
|
|
worldmap.c();
|
|
+
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callEvent(new org.bukkit.event.server.MapInitializeEvent(worldmap.mapView)); // CraftBukkit
|
|
+
|
|
--itemstack.count;
|
|
if (itemstack.count <= 0) {
|
|
return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, itemstack1);
|