-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cache map ids on item frames (#9584)
- Loading branch information
1 parent
9bc70e6
commit 3c41f8f
Showing
1 changed file
with
39 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Warrior <50800980+Warriorrrr@users.noreply.github.com> | ||
Date: Mon, 7 Aug 2023 12:58:28 +0200 | ||
Subject: [PATCH] Cache map ids on item frames | ||
|
||
|
||
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java | ||
index d934d07ad761319f338d4386536f68fde211c041..196280f54e397c69d32bd4d1f6ae666efdd93773 100644 | ||
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java | ||
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java | ||
@@ -115,7 +115,7 @@ public class ServerEntity { | ||
ItemStack itemstack = entityitemframe.getItem(); | ||
|
||
if (this.level.paperConfig().maps.itemFrameCursorUpdateInterval > 0 && this.tickCount % this.level.paperConfig().maps.itemFrameCursorUpdateInterval == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks // Paper - Make item frame map cursor update interval configurable | ||
- Integer integer = MapItem.getMapId(itemstack); | ||
+ Integer integer = entityitemframe.cachedMapId; // Paper | ||
MapItemSavedData worldmap = MapItem.getSavedData(integer, this.level); | ||
|
||
if (worldmap != null) { | ||
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 dcf245387f59ce730cb2cfb5fc0e837a20d3dfe5..759ecd79534a7706f7d4a63eb9dacbefcfe54674 100644 | ||
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java | ||
+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java | ||
@@ -50,6 +50,7 @@ public class ItemFrame extends HangingEntity { | ||
public static final int NUM_ROTATIONS = 8; | ||
public float dropChance; | ||
public boolean fixed; | ||
+ public Integer cachedMapId; // Paper | ||
|
||
public ItemFrame(EntityType<? extends ItemFrame> type, Level world) { | ||
super(type, world); | ||
@@ -393,6 +394,7 @@ public class ItemFrame extends HangingEntity { | ||
} | ||
|
||
private void onItemChanged(ItemStack stack) { | ||
+ this.cachedMapId = MapItem.getMapId(stack); // Paper | ||
if (!stack.isEmpty() && stack.getFrame() != this) { | ||
stack.setEntityRepresentation(this); | ||
} |