Updated Upstream ()

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-123848
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 2a3ec299283c2cc039877eade6e2ddee8f3812ea..420c13e00ca3e22a101d3867f99fdf2dd30776a8 100644
index 8c09cac6e423f707f1b641c2b3350dcee4372f5f..2edf53d37508acd15bab7730ecb5d9fc0ce18e23 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
@@ -288,6 +288,13 @@ public class ItemFrame extends HangingEntity {
@@ -20,5 +20,5 @@ index 2a3ec299283c2cc039877eade6e2ddee8f3812ea..420c13e00ca3e22a101d3867f99fdf2d
+ // Purpur end
+
private void removeFramedMap(ItemStack itemstack) {
this.getFramedMapId().ifPresent((i) -> {
MapItemSavedData worldmap = MapItem.getSavedData(i, this.level);
// Paper start - fix MC-252817 (green map markers do not disappear)
this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> {