Merge pull request #61 in SPIGOT/craftbukkit from ~FEARTHE1337/craftbukkit:SPIGOT-149 to master

* commit '5ae6f9935cad9a76f1a421bd24c2a4df1f79954d':
  Spigot-149 - Save map in primary world.
This commit is contained in:
Thinkofdeath 2014-12-17 16:30:25 +01:00
commit 975c9ed4f9

View file

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ItemMapEmpty.java 2014-11-28 17:43:43.237707432 +0000 --- ../work/decompile-8eb82bde//net/minecraft/server/ItemMapEmpty.java Wed Dec 17 16:16:12 2014
+++ src/main/java/net/minecraft/server/ItemMapEmpty.java 2014-11-28 17:38:23.000000000 +0000 +++ src/main/java/net/minecraft/server/ItemMapEmpty.java Wed Dec 17 16:16:12 2014
@@ -7,15 +7,19 @@ @@ -7,15 +7,19 @@
} }
@ -10,7 +10,8 @@
String s = "map_" + itemstack1.getData(); String s = "map_" + itemstack1.getData();
WorldMap worldmap = new WorldMap(s); WorldMap worldmap = new WorldMap(s);
world.a(s, (PersistentBase) worldmap); - world.a(s, (PersistentBase) worldmap);
+ worldMain.a(s, (PersistentBase) worldmap);
worldmap.scale = 0; worldmap.scale = 0;
worldmap.a(entityhuman.locX, entityhuman.locZ, worldmap.scale); worldmap.a(entityhuman.locX, entityhuman.locZ, worldmap.scale);
- worldmap.map = (byte) world.worldProvider.getDimension(); - worldmap.map = (byte) world.worldProvider.getDimension();