1 files changed, 35 insertions, 0 deletions
diff --git a/patches/server/0898-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0898-fix-MC-252817-green-map-markers-do-not-disappear.patch
new file mode 100644
index 0000000000..e5593afbc6
--- /dev/null
+++ b/patches/server/0898-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 <[email protected]>
+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 a86472cce8e8fcde16d761842fe443a619f6e305..955316687e2e29ad75a0052317a7b0f89034c82a 100644
+--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+@@ -288,7 +288,9 @@ 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) {
+@@ -306,7 +308,12 @@ 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);
+