85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Tue, 14 Jan 2020 15:28:28 -0800
|
|
Subject: [PATCH] Lag compensate eating
|
|
|
|
When the server is lagging, players will wait longer when eating.
|
|
Change to also use a time check instead if it passes.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index 17491b9f9b4c8fb931a249580810681cb618ee45..3d30dcfdf124ff634afff3db17375bad06a19ad8 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity {
|
|
private int jumpTicks;
|
|
private float bD;
|
|
public ItemStack activeItem; // Paper - public
|
|
- protected int bk;
|
|
+ protected int bk; protected final int getEatTimeTicks() { return this.bk; } protected final void setEatTimeTicks(int value) { this.bk = value; } // Paper - OBFHELPER
|
|
protected int bl;
|
|
private BlockPosition bE;
|
|
private Optional<BlockPosition> bF;
|
|
@@ -3012,6 +3012,11 @@ public abstract class EntityLiving extends Entity {
|
|
return ((Byte) this.datawatcher.get(EntityLiving.an) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND;
|
|
}
|
|
|
|
+ // Paper start - lag compensate eating
|
|
+ protected long eatStartTime;
|
|
+ protected int totalEatTimeTicks;
|
|
+ // Paper end
|
|
+
|
|
private void u() {
|
|
if (this.isHandRaised()) {
|
|
if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
|
|
@@ -3021,7 +3026,13 @@ public abstract class EntityLiving extends Entity {
|
|
this.b(this.activeItem, 5);
|
|
}
|
|
|
|
- if (--this.bk == 0 && !this.world.isClientSide && !this.activeItem.m()) {
|
|
+ // Paper start - lag compensate eating
|
|
+ // we add 1 to the expected time to avoid lag compensating when we should not
|
|
+ boolean shouldLagCompensate
|
|
+ = this.activeItem.getItem().isFood() && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1 + this.totalEatTimeTicks) * 50 * (1000 * 1000));
|
|
+ if ((--this.bk == 0 || shouldLagCompensate) && !this.world.isClientSide && !this.activeItem.m()) {
|
|
+ this.setEatTimeTicks(0);
|
|
+ // Paper end
|
|
this.s();
|
|
}
|
|
} else {
|
|
@@ -3071,7 +3082,10 @@ public abstract class EntityLiving extends Entity {
|
|
|
|
if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
|
|
this.activeItem = itemstack;
|
|
- this.bk = itemstack.k();
|
|
+ // Paper start - lag compensate eating
|
|
+ this.bk = this.totalEatTimeTicks = itemstack.k();
|
|
+ this.eatStartTime = System.nanoTime();
|
|
+ // Paper end
|
|
if (!this.world.isClientSide) {
|
|
this.c(1, true);
|
|
this.c(2, enumhand == EnumHand.OFF_HAND);
|
|
@@ -3095,7 +3109,10 @@ public abstract class EntityLiving extends Entity {
|
|
}
|
|
} else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
|
|
this.activeItem = ItemStack.b;
|
|
- this.bk = 0;
|
|
+ // Paper start - lag compensate eating
|
|
+ this.bk = this.totalEatTimeTicks = 0;
|
|
+ this.eatStartTime = -1L;
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
@@ -3217,7 +3234,10 @@ public abstract class EntityLiving extends Entity {
|
|
}
|
|
|
|
this.activeItem = ItemStack.b;
|
|
- this.bk = 0;
|
|
+ // Paper start - lag compensate eating
|
|
+ this.bk = this.totalEatTimeTicks = 0;
|
|
+ this.eatStartTime = -1L;
|
|
+ // Paper end
|
|
}
|
|
|
|
public boolean isBlocking() {
|