diff options
author | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
commit | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch) | |
tree | 9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/WorldMap.patch | |
parent | 4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff) | |
download | craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip |
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/WorldMap.patch')
-rw-r--r-- | nms-patches/WorldMap.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/WorldMap.patch b/nms-patches/WorldMap.patch index be793710..84f4c0df 100644 --- a/nms-patches/WorldMap.patch +++ b/nms-patches/WorldMap.patch @@ -1,8 +1,8 @@ --- a/net/minecraft/server/WorldMap.java +++ b/net/minecraft/server/WorldMap.java -@@ -6,6 +6,14 @@ - import java.util.List; +@@ -7,6 +7,14 @@ import java.util.Map; + import javax.annotation.Nullable; +// CraftBukkit start +import java.util.UUID; @@ -15,7 +15,7 @@ public class WorldMap extends PersistentBase { public int centerX; -@@ -18,8 +26,18 @@ +@@ -19,8 +27,18 @@ private Map<EntityHuman, WorldMap.WorldMapHumanTracker> j = Maps.newHashMap(); public Map<String, MapIcon> decorations = Maps.newLinkedHashMap(); @@ -34,7 +34,7 @@ } public void a(double d0, double d1, int i) { -@@ -32,7 +50,30 @@ +@@ -33,7 +51,30 @@ } public void a(NBTTagCompound nbttagcompound) { @@ -66,10 +66,10 @@ this.centerX = nbttagcompound.getInt("xCenter"); this.centerZ = nbttagcompound.getInt("zCenter"); this.scale = nbttagcompound.getByte("scale"); -@@ -73,6 +114,25 @@ +@@ -74,6 +115,25 @@ } - public void b(NBTTagCompound nbttagcompound) { + public NBTTagCompound b(NBTTagCompound nbttagcompound) { + // CraftBukkit start + if (this.map >= 10) { + if (this.uniqueId == null) { @@ -92,7 +92,7 @@ nbttagcompound.setByte("dimension", this.map); nbttagcompound.setInt("xCenter", this.centerX); nbttagcompound.setInt("zCenter", this.centerZ); -@@ -220,12 +280,26 @@ +@@ -223,12 +283,26 @@ } public Packet<?> a(ItemStack itemstack) { |