diff options
author | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
commit | b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb (patch) | |
tree | 429b9bd9ef2cc19e42b8656ef25ca1548f5efe88 /patches/server/0987-Cache-map-ids-on-item-frames.patch | |
parent | 81c5901c674e6ee89dbfed4848c9eb645bfb0f16 (diff) | |
download | Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.tar.gz Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.zip |
Revert "re-add distance map patch"
This reverts commit 81c5901c674e6ee89dbfed4848c9eb645bfb0f16.
Diffstat (limited to 'patches/server/0987-Cache-map-ids-on-item-frames.patch')
-rw-r--r-- | patches/server/0987-Cache-map-ids-on-item-frames.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/patches/server/0987-Cache-map-ids-on-item-frames.patch b/patches/server/0987-Cache-map-ids-on-item-frames.patch deleted file mode 100644 index 6e67ceed13..0000000000 --- a/patches/server/0987-Cache-map-ids-on-item-frames.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 e2795f6ee05141374736dd5821e23431b26c6162..b6639c363653a8ac802d800d7228d85c078ff163 100644 ---- a/src/main/java/net/minecraft/server/level/ServerEntity.java -+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java -@@ -118,7 +118,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); - } |