From 97cb10205d0ccc2112b1820f4f2d40f4c2251d40 Mon Sep 17 00:00:00 2001 From: braindead Date: Sat, 12 Nov 2022 14:16:25 -0500 Subject: [PATCH] fix MC-252817 (green map markers do not dissappear) (#8545) --- ...7-green-map-markers-do-not-disappear.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch new file mode 100644 index 0000000000..2c87a76e23 --- /dev/null +++ b/patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: braindead +Date: Sat, 5 Nov 2022 17:47:26 -0400 +Subject: [PATCH] fix MC-252817 (green map markers do not disappear). + +this bug is caused by the fact that the itemframe's item is set to empty before the green marker is requested to be removed. this is fixed by getting the mapid from this method's parameter, rather than the air block now stored by the item frame. + +diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java ++++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +@@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity { + } + + private void removeFramedMap(ItemStack itemstack) { +- this.getFramedMapId().ifPresent((i) -> { ++ // Paper start - fix MC-252817 (green map markers do not disappear) ++ this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> { ++ // Paper end + MapItemSavedData worldmap = MapItem.getSavedData(i, this.level); + + if (worldmap != null) { +@@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity { + + public OptionalInt getFramedMapId() { + ItemStack itemstack = this.getItem(); ++ // Paper start - fix MC-252817 (green map markers do not disappear) ++ return this.getFramedMapIdFromItem(itemstack); ++ } + ++ public OptionalInt getFramedMapIdFromItem(ItemStack itemstack) { ++ // Paper end + if (itemstack.is(Items.FILLED_MAP)) { + Integer integer = MapItem.getMapId(itemstack); +