aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0406-Lag-compensate-eating.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0406-Lag-compensate-eating.patch')
-rw-r--r--Spigot-Server-Patches/0406-Lag-compensate-eating.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-Server-Patches/0406-Lag-compensate-eating.patch b/Spigot-Server-Patches/0406-Lag-compensate-eating.patch
index 0efa064d22..61bc5556dd 100644
--- a/Spigot-Server-Patches/0406-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0406-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ 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 12b27c44d77b72fa4a4d42cfe3db8394a47d9c9b..b213a13c18ad483472808f4fe9743f74821a25cd 100644
+index f71ca4ee57d86c30d78c8292ced0531b963beabb..fd8b3d05238329adf3f638b1e04fd95c08e0a74a 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 {
@@ -19,7 +19,7 @@ index 12b27c44d77b72fa4a4d42cfe3db8394a47d9c9b..b213a13c18ad483472808f4fe9743f74
protected int bl;
private BlockPosition bE;
private Optional<BlockPosition> bF;
-@@ -3018,6 +3018,11 @@ public abstract class EntityLiving extends Entity {
+@@ -3015,6 +3015,11 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.an) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND;
}
@@ -31,7 +31,7 @@ index 12b27c44d77b72fa4a4d42cfe3db8394a47d9c9b..b213a13c18ad483472808f4fe9743f74
private void u() {
if (this.isHandRaised()) {
if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
-@@ -3027,7 +3032,13 @@ public abstract class EntityLiving extends Entity {
+@@ -3024,7 +3029,13 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 5);
}
@@ -46,7 +46,7 @@ index 12b27c44d77b72fa4a4d42cfe3db8394a47d9c9b..b213a13c18ad483472808f4fe9743f74
this.s();
}
} else {
-@@ -3077,7 +3088,10 @@ public abstract class EntityLiving extends Entity {
+@@ -3074,7 +3085,10 @@ public abstract class EntityLiving extends Entity {
if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
this.activeItem = itemstack;
@@ -58,7 +58,7 @@ index 12b27c44d77b72fa4a4d42cfe3db8394a47d9c9b..b213a13c18ad483472808f4fe9743f74
if (!this.world.isClientSide) {
this.c(1, true);
this.c(2, enumhand == EnumHand.OFF_HAND);
-@@ -3101,7 +3115,10 @@ public abstract class EntityLiving extends Entity {
+@@ -3098,7 +3112,10 @@ public abstract class EntityLiving extends Entity {
}
} else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
this.activeItem = ItemStack.b;
@@ -70,7 +70,7 @@ index 12b27c44d77b72fa4a4d42cfe3db8394a47d9c9b..b213a13c18ad483472808f4fe9743f74
}
}
-@@ -3223,7 +3240,10 @@ public abstract class EntityLiving extends Entity {
+@@ -3220,7 +3237,10 @@ public abstract class EntityLiving extends Entity {
}
this.activeItem = ItemStack.b;