diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
| commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
| tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/ItemWorldMap.patch | |
| parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
| download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip | |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/ItemWorldMap.patch')
| -rw-r--r-- | nms-patches/ItemWorldMap.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/nms-patches/ItemWorldMap.patch b/nms-patches/ItemWorldMap.patch index 36c0fb0d..8682285d 100644 --- a/nms-patches/ItemWorldMap.patch +++ b/nms-patches/ItemWorldMap.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ItemWorldMap.java 2014-11-28 17:43:43.245707432 +0000 -+++ src/main/java/net/minecraft/server/ItemWorldMap.java 2014-11-28 17:38:18.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/ItemWorldMap.java 2015-02-26 22:40:22.855608136 +0000 ++++ src/main/java/net/minecraft/server/ItemWorldMap.java 2015-02-26 22:40:22.855608136 +0000 @@ -4,6 +4,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multisets; @@ -21,7 +21,7 @@ - WorldMap worldmap = (WorldMap) world.a(WorldMap.class, s); + WorldMap worldmap = (WorldMap) worldMain.a(WorldMap.class, s); // CraftBukkit - use primary world for maps - if (worldmap == null && !world.isStatic) { + if (worldmap == null && !world.isClientSide) { - itemstack.setData(world.b("map")); + itemstack.setData(worldMain.b("map")); // CraftBukkit - use primary world for maps s = "map_" + itemstack.getData(); @@ -33,7 +33,7 @@ worldmap.c(); - world.a(s, (PersistentBase) worldmap); + worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit - use primary world for maps -+ ++ + // CraftBukkit start + MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView); + Bukkit.getServer().getPluginManager().callEvent(event); @@ -50,7 +50,7 @@ int i = 1 << worldmap.scale; int j = worldmap.centerX; int k = worldmap.centerZ; -@@ -179,6 +191,8 @@ +@@ -181,6 +193,8 @@ if (itemstack.hasTag() && itemstack.getTag().getBoolean("map_is_scaling")) { WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, world); @@ -59,13 +59,11 @@ itemstack.setData(world.b("map")); WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData()); -@@ -190,7 +204,12 @@ - worldmap1.a((double) worldmap.centerX, (double) worldmap.centerZ, worldmap1.scale); +@@ -193,6 +207,11 @@ worldmap1.map = worldmap.map; worldmap1.c(); -- world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1); -+ world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1); -+ + world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1); ++ + // CraftBukkit start + MapInitializeEvent event = new MapInitializeEvent(worldmap1.mapView); + Bukkit.getServer().getPluginManager().callEvent(event); |