Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport MC-160177 fix from 1.15 (#2702)
- Loading branch information
1 parent
45089d5
commit 23e53aa
Showing
1 changed file
with
34 additions
and
0 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
Spigot-Server-Patches/0423-Backport-MC-160177-fix-from-1.15.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|