mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 04:09:54 +01:00
cc6fd371b2
Fixes #6357 Closes #6508 Closes #6358
36 lines
2.4 KiB
Diff
36 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
|
|
Date: Fri, 13 Aug 2021 01:14:38 +0200
|
|
Subject: [PATCH] Configurable item frame map cursor update interval
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index a14602b6ef00e9ac544582c0d8f4f43a5fcbf908..e1f386cccdf0d2f6831c86667230e0bc8ee39cc9 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -862,6 +862,11 @@ public class PaperWorldConfig {
|
|
mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
|
|
}
|
|
|
|
+ public int mapItemFrameCursorUpdateInterval = 10;
|
|
+ private void itemFrameCursorUpdateInterval() {
|
|
+ mapItemFrameCursorUpdateInterval = getInt("map-item-frame-cursor-update-interval", mapItemFrameCursorUpdateInterval);
|
|
+ }
|
|
+
|
|
public boolean fixItemsMergingThroughWalls;
|
|
private void fixItemsMergingThroughWalls() {
|
|
fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
index e5cae2fb67541785072324e5434820ee4b169556..9950541e0432240207458274b76b1c5d402ac704 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
@@ -99,7 +99,7 @@ public class ServerEntity {
|
|
ItemFrame entityitemframe = (ItemFrame) this.entity;
|
|
ItemStack itemstack = entityitemframe.getItem();
|
|
|
|
- if (this.tickCount % 10 == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks
|
|
+ if (this.level.paperConfig.mapItemFrameCursorUpdateInterval > 0 && this.tickCount % this.level.paperConfig.mapItemFrameCursorUpdateInterval == 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);
|
|
MapItemSavedData worldmap = MapItem.getSavedData(integer, (Level) this.level);
|
|
|