SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
paper-server/nms-patches/ItemWorldMap.patch
View File

@@ -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);