mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 07:20:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible divide by 0 error with cursor updates (#6398)

Browse Source
This commit is contained in:
Jake Potrebic 2021-08-14 10:44:31 -07:00 committed by GitHub
parent 8d182e8639
commit 72ce684679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch
View File

@ -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);