Paper/Spigot-Server-Patches/0406-Lag-compensate-eating.patch

85 lines
3.8 KiB
Diff
Raw Normal View History

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 f71ca4ee57d86c30d78c8292ced0531b963beabb..fd8b3d05238329adf3f638b1e04fd95c08e0a74a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2020-06-26 01:38:24 +02:00
@@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity {
private int jumpTicks;
private float bD;
public ItemStack activeItem; // Paper - public
2020-06-26 01:38:24 +02:00
- 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;
2020-06-26 01:38:24 +02:00
private Optional<BlockPosition> bF;
@@ -3015,6 +3015,11 @@ public abstract class EntityLiving extends Entity {
2020-06-26 01:38:24 +02:00
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
2020-06-26 01:38:24 +02:00
+
private void u() {
if (this.isHandRaised()) {
if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
@@ -3024,7 +3029,13 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 5);
}
2020-06-26 01:38:24 +02:00
- 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));
2020-06-26 01:38:24 +02:00
+ if ((--this.bk == 0 || shouldLagCompensate) && !this.world.isClientSide && !this.activeItem.m()) {
+ this.setEatTimeTicks(0);
+ // Paper end
2020-06-26 01:38:24 +02:00
this.s();
}
} else {
@@ -3074,7 +3085,10 @@ public abstract class EntityLiving extends Entity {
if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
this.activeItem = itemstack;
2020-06-26 01:38:24 +02:00
- this.bk = itemstack.k();
+ // Paper start - lag compensate eating
2020-06-26 01:38:24 +02:00
+ 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);
@@ -3098,7 +3112,10 @@ public abstract class EntityLiving extends Entity {
}
} else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
2020-06-26 01:38:24 +02:00
this.activeItem = ItemStack.b;
- this.bk = 0;
+ // Paper start - lag compensate eating
2020-06-26 01:38:24 +02:00
+ this.bk = this.totalEatTimeTicks = 0;
+ this.eatStartTime = -1L;
+ // Paper end
}
}
@@ -3220,7 +3237,10 @@ public abstract class EntityLiving extends Entity {
}
2020-06-26 01:38:24 +02:00
this.activeItem = ItemStack.b;
- this.bk = 0;
+ // Paper start - lag compensate eating
2020-06-26 01:38:24 +02:00
+ this.bk = this.totalEatTimeTicks = 0;
+ this.eatStartTime = -1L;
+ // Paper end
}
public boolean isBlocking() {