From 338d2617e7633c42a1951d9d633f82f8ca9c7cdd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 19:41:36 +1100 Subject: [PATCH] Compensate for CB always having its own renderer --- CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch index 00684d461e..2f74141950 100644 --- a/CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch +++ b/CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch @@ -1,4 +1,4 @@ -From 8406ab4e0f88e18b43406c8780e345b865251425 Mon Sep 17 00:00:00 2001 +From a7d97767e0fa796db6cbc95da373f4dc1d9f40c0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 19:08:41 +1100 Subject: [PATCH] Limit Custom Map Rendering @@ -25,7 +25,7 @@ index cf3bb1f..ebc0fc7 100644 return abyte == null ? null : new Packet131ItemData((short) Item.MAP.id, (short) itemstack.getData(), abyte); diff --git a/src/main/java/net/minecraft/server/WorldMapHumanTracker.java b/src/main/java/net/minecraft/server/WorldMapHumanTracker.java -index bf3e6fe..49449c9 100644 +index bf3e6fe..448800d 100644 --- a/src/main/java/net/minecraft/server/WorldMapHumanTracker.java +++ b/src/main/java/net/minecraft/server/WorldMapHumanTracker.java @@ -41,23 +41,29 @@ public class WorldMapHumanTracker { @@ -34,7 +34,7 @@ index bf3e6fe..49449c9 100644 - org.bukkit.craftbukkit.map.RenderData render = this.worldMap.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) trackee.getBukkitEntity()); // CraftBukkit + // Spigot start -+ boolean custom = this.worldMap.mapView.renderers.size() != 0; ++ boolean custom = this.worldMap.mapView.renderers.size() > 1; + org.bukkit.craftbukkit.map.RenderData render = (custom) ? this.worldMap.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) trackee.getBukkitEntity()) : null; // CraftBukkit if (--this.g < 0) {