Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Don't share WorldMapCollection. Fixes BUKKIT-4871

Browse Source 
WorldMapCollection stores scoreboard, map (item), structure, and
village information. Scoreboards are explicitly handled globally,
while villages and structures are erroneously shared.

This commit separates the WorldMapCollections to not be shared among
custom worlds. Maps are special-cased to maintain the previous shared
behavior.
This commit is contained in:
Wesley Wolfe 2013-10-30 04:22:00 -05:00
parent 84237bb783
commit 7aabcb2ab3
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/ItemWorldMap.java
View File

@ -14,7 +14,7 @@ public class ItemWorldMap extends ItemWorldMapBase {
public WorldMap getSavedMap(ItemStack itemstack, World world) {
String s = "map_" + itemstack.getData();
WorldMap worldmap = (WorldMap) world.a(WorldMap.class, s);
WorldMap worldmap = (WorldMap) world.getServer().getServer().worlds.get(0).a(WorldMap.class, s); // CraftBukkit - use primary world for maps
if (worldmap == null && !world.isStatic) {
itemstack.setData(world.b("map"));

1
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -730,7 +730,6 @@ public final class CraftServer implements Server {
return null;
}
internal.worldMaps = console.worlds.get(0).worldMaps;
internal.scoreboard = getScoreboardManager().getMainScoreboard().getHandle();
internal.tracker = new EntityTracker(internal);