From 72ce68467908aec2d4fa6f4befc11e99f0b49000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com> Date: Sat, 14 Aug 2021 10:44:31 -0700 Subject: [PATCH] Fix possible divide by 0 error with cursor updates (#6398) --- ...3-Configurable-item-frame-map-cursor-update-interval.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch index be941c5c3a..d0d4cd9002 100644 --- a/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch @@ -21,7 +21,7 @@ index cad6b4479ad3ab9e2e4bb3a733a66e4a2598dc90..af06e87191b2a04dc8e7c7555ab98bef 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..fe62ec1a888a93d90f40d86908f83faaed907ba6 100644 +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 { @@ -29,7 +29,7 @@ index e5cae2fb67541785072324e5434820ee4b169556..fe62ec1a888a93d90f40d86908f83faa 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 ++ 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);