Spigot / CraftBukkit / dd016e7135d

Commits

md_5 authored dd016e7135d 10 Mar 2016

SPIGOT-1847: Maps in non default worlds

Modified


7 7	- ItemStack itemstack1 = new ItemStack(Items.FILLED_MAP, 1, world.b("map"));
8 8	+ World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
9 9	+ ItemStack itemstack1 = new ItemStack(Items.FILLED_MAP, 1, worldMain.b("map")); // CraftBukkit - use primary world for maps
10 10	String s = "map_" + itemstack1.getData();
11 11	WorldMap worldmap = new WorldMap(s);
12 12
13 13	- world.a(s, (PersistentBase) worldmap);
14 14	+ worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit
15 15	worldmap.scale = 0;
16 16	worldmap.a(entityhuman.locX, entityhuman.locZ, worldmap.scale);
17 -	worldmap.map = (byte) world.worldProvider.getDimensionManager().getDimensionID();
17 +	- worldmap.map = (byte) world.worldProvider.getDimensionManager().getDimensionID();
18 +	+ worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - use bukkit dimension
18 19	worldmap.track = true;
19 20	worldmap.c();
20 21	+
21 22	+ org.bukkit.craftbukkit.event.CraftEventFactory.callEvent(new org.bukkit.event.server.MapInitializeEvent(worldmap.mapView)); // CraftBukkit
22 23	+
23 24	--itemstack.count;
24 25	if (itemstack.count <= 0) {
25 26	return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, itemstack1);