aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0843-Cache-map-ids-on-item-frames.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-10-27 18:11:15 +0100
committerNassim Jahnke <[email protected]>2024-10-27 18:39:30 +0100
commit02bca1e6558bf4ac0cbf928d48e90f497b10b0a3 (patch)
tree1144072e447f4c0b7e80b278fd769106227f016a /patches/server/0843-Cache-map-ids-on-item-frames.patch
parent12ed02105177f54906a7d4422b235929426bc264 (diff)
downloadPaper-02bca1e6558bf4ac0cbf928d48e90f497b10b0a3.tar.gz
Paper-02bca1e6558bf4ac0cbf928d48e90f497b10b0a3.zip
Remove timings impl
Diffstat (limited to 'patches/server/0843-Cache-map-ids-on-item-frames.patch')
-rw-r--r--patches/server/0843-Cache-map-ids-on-item-frames.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0843-Cache-map-ids-on-item-frames.patch b/patches/server/0843-Cache-map-ids-on-item-frames.patch
new file mode 100644
index 0000000000..38554e1a9c
--- /dev/null
+++ b/patches/server/0843-Cache-map-ids-on-item-frames.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Warrior <[email protected]>
+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 3cdcc4f44608d24550f2a8c6f3f5ce675d7777c5..7118e1f806af98159ec292f9340d7e4004e2b486 100644
+--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+@@ -121,7 +121,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
+- MapId mapid = (MapId) itemstack.get(DataComponents.MAP_ID);
++ MapId mapid = entityitemframe.cachedMapId; // Paper - Perf: Cache map ids on item frames
+ MapItemSavedData worldmap = MapItem.getSavedData(mapid, 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 65f7f1f98f415a564aadb440d3a67143699e43db..d6f835320014c07f9d174d05929ed8cc16a10c10 100644
+--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+@@ -51,6 +51,7 @@ public class ItemFrame extends HangingEntity {
+ private static final float HEIGHT = 0.75F;
+ public float dropChance;
+ public boolean fixed;
++ public @Nullable MapId cachedMapId; // Paper - Perf: Cache map ids on item frames
+
+ public ItemFrame(EntityType<? extends ItemFrame> type, Level world) {
+ super(type, world);
+@@ -334,6 +335,7 @@ public class ItemFrame extends HangingEntity {
+ }
+
+ private void onItemChanged(ItemStack stack) {
++ this.cachedMapId = stack.getComponents().get(net.minecraft.core.component.DataComponents.MAP_ID); // Paper - Perf: Cache map ids on item frames
+ if (!stack.isEmpty() && stack.getFrame() != this) {
+ stack.setEntityRepresentation(this);
+ }