diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-17 16:30:25 +0100 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-17 16:30:25 +0100 |
commit | 975c9ed4f9f463cd003da6be3b1e9929f13dccd6 (patch) | |
tree | 37a2c14b03642de33161188cdd39bf4ce4b420bc | |
parent | 20c65caae7eded1bf14f0e4c42d51e7c369b2ce5 (diff) | |
parent | 5ae6f9935cad9a76f1a421bd24c2a4df1f79954d (diff) | |
download | craftbukkit-975c9ed4f9f463cd003da6be3b1e9929f13dccd6.tar craftbukkit-975c9ed4f9f463cd003da6be3b1e9929f13dccd6.tar.gz craftbukkit-975c9ed4f9f463cd003da6be3b1e9929f13dccd6.tar.lz craftbukkit-975c9ed4f9f463cd003da6be3b1e9929f13dccd6.tar.xz craftbukkit-975c9ed4f9f463cd003da6be3b1e9929f13dccd6.zip |
Merge pull request #61 in SPIGOT/craftbukkit from ~FEARTHE1337/craftbukkit:SPIGOT-149 to master
* commit '5ae6f9935cad9a76f1a421bd24c2a4df1f79954d':
Spigot-149 - Save map in primary world.
-rw-r--r-- | nms-patches/ItemMapEmpty.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nms-patches/ItemMapEmpty.patch b/nms-patches/ItemMapEmpty.patch index 616e97ba..ffa0d01f 100644 --- a/nms-patches/ItemMapEmpty.patch +++ b/nms-patches/ItemMapEmpty.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ItemMapEmpty.java 2014-11-28 17:43:43.237707432 +0000 -+++ src/main/java/net/minecraft/server/ItemMapEmpty.java 2014-11-28 17:38:23.000000000 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/ItemMapEmpty.java Wed Dec 17 16:16:12 2014 ++++ src/main/java/net/minecraft/server/ItemMapEmpty.java Wed Dec 17 16:16:12 2014 @@ -7,15 +7,19 @@ } @@ -10,7 +10,8 @@ String s = "map_" + itemstack1.getData(); WorldMap worldmap = new WorldMap(s); - world.a(s, (PersistentBase) worldmap); +- world.a(s, (PersistentBase) worldmap); ++ worldMain.a(s, (PersistentBase) worldmap); worldmap.scale = 0; worldmap.a(entityhuman.locX, entityhuman.locZ, worldmap.scale); - worldmap.map = (byte) world.worldProvider.getDimension(); |