Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-29 06:57:37 +02:00
Code Issues Projects Releases Wiki Activity

Backport MC-160177 fix from 1.15 (#2702)

Browse Source
This commit is contained in:
Gerrygames 2019-11-24 07:36:20 +01:00 committed by Zach
parent 45089d59f0
commit 23e53aab97
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Spigot-Server-Patches/0423-Backport-MC-160177-fix-from-1.15.patch Normal file
View File

@ -0,0 +1,34 @@
From 5b2cfa47f19b2dfb4aeb6af81cc7309de224ff27 Mon Sep 17 00:00:00 2001
From: Gerrygames <gecam59@gmail.com>
Date: Thu, 21 Nov 2019 14:56:51 +0100
Subject: [PATCH] Backport MC-160177 fix from 1.15
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index bc03a82b..c77e812b 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -86,14 +86,17 @@ public class PlayerInteractManager {
this.l = -1;
this.e = false;
} else {
- this.a(iblockdata, this.g);
+ this.a(iblockdata, this.g, this.lastDigTick); // Paper - pass lastDigTick as an argument
}
}
}
- private float a(IBlockData iblockdata, BlockPosition blockposition) {
- int i = this.currentTick - this.k;
+ // Paper start - Add startTick parameter and use it
+ private float a(IBlockData iblockdata, BlockPosition blockposition) { return this.a(iblockdata, blockposition, this.k); }
+ private float a(IBlockData iblockdata, BlockPosition blockposition, int startTick) {
+ int i = this.currentTick - startTick;
+ // Paper end
float f = iblockdata.getDamage(this.player, this.player.world, blockposition) * (float) (i + 1);
int j = (int) (f * 10.0F);
--
2.24.0