OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-20 14:08:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ensure maps are stored only in the main world. Fixes BUKKIT-4872

Browse source
This commit is contained in:
feildmaster 2013-10-30 13:23:24 -05:00 • committed by EvilSeph
parent 7aabcb2ab3
commit 1c7698fab2
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/minecraft/server/ItemMapEmpty.java
View file

@ -8,11 +8,12 @@ public class ItemMapEmpty extends ItemWorldMapBase {
} }
public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) { public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
ItemStack itemstack1 = new ItemStack(Item.MAP, 1, world.b("map")); World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
ItemStack itemstack1 = new ItemStack(Item.MAP, 1, worldMain.b("map")); // CraftBukkit - use primary world for maps
String s = "map_" + itemstack1.getData(); String s = "map_" + itemstack1.getData();
WorldMap worldmap = new WorldMap(s); WorldMap worldmap = new WorldMap(s);
world.a(s, (WorldMapBase) worldmap); worldMain.a(s, (WorldMapBase) worldmap); // CraftBukkit - use primary world for maps
worldmap.scale = 0; worldmap.scale = 0;
int i = 128 * (1 << worldmap.scale); int i = 128 * (1 << worldmap.scale);

9
src/main/java/net/minecraft/server/ItemWorldMap.java
View file

@ -13,11 +13,12 @@ public class ItemWorldMap extends ItemWorldMapBase {
} }
public WorldMap getSavedMap(ItemStack itemstack, World world) { public WorldMap getSavedMap(ItemStack itemstack, World world) {
World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
String s = "map_" + itemstack.getData(); String s = "map_" + itemstack.getData();
WorldMap worldmap = (WorldMap) world.getServer().getServer().worlds.get(0).a(WorldMap.class, s); // CraftBukkit - use primary world for maps WorldMap worldmap = (WorldMap) worldMain.a(WorldMap.class, s); // CraftBukkit - use primary world for maps
if (worldmap == null && !world.isStatic) { if (worldmap == null && !world.isStatic) {
itemstack.setData(world.b("map")); itemstack.setData(worldMain.b("map")); // CraftBukkit - use primary world for maps
s = "map_" + itemstack.getData(); s = "map_" + itemstack.getData();
worldmap = new WorldMap(s); worldmap = new WorldMap(s);
worldmap.scale = 3; worldmap.scale = 3;
@ -27,7 +28,7 @@ public class ItemWorldMap extends ItemWorldMapBase {
worldmap.centerZ = Math.round((float) (world.getWorldData().e() / i)) * i; worldmap.centerZ = Math.round((float) (world.getWorldData().e() / i)) * i;
worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - fixes Bukkit multiworld maps worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - fixes Bukkit multiworld maps
worldmap.c(); worldmap.c();
world.a(s, (WorldMapBase) worldmap); worldMain.a(s, (WorldMapBase) worldmap); // CraftBukkit - use primary world for maps
// CraftBukkit start // CraftBukkit start
MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView); MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView);
@ -237,6 +238,8 @@ public class ItemWorldMap extends ItemWorldMapBase {
if (itemstack.hasTag() && itemstack.getTag().getBoolean("map_is_scaling")) { if (itemstack.hasTag() && itemstack.getTag().getBoolean("map_is_scaling")) {
WorldMap worldmap = Item.MAP.getSavedMap(itemstack, world); WorldMap worldmap = Item.MAP.getSavedMap(itemstack, world);
world = world.getServer().getServer().worlds.get(0); // CraftBukkit - use primary world for maps
itemstack.setData(world.b("map")); itemstack.setData(world.b("map"));
WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData()); WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData());