diff options
Diffstat (limited to 'patches/server/0356-Lag-compensate-eating.patch')
-rw-r--r-- | patches/server/0356-Lag-compensate-eating.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0356-Lag-compensate-eating.patch b/patches/server/0356-Lag-compensate-eating.patch index c9c15b8277..8c2ac4598b 100644 --- a/patches/server/0356-Lag-compensate-eating.patch +++ b/patches/server/0356-Lag-compensate-eating.patch @@ -7,10 +7,10 @@ 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/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bb53c547e31ed9d7bcc04b06d774b70607ef927f..b8877b52e4ba032fc43d95647d177cd38fb6aaf8 100644 +index 2b2258b8cc35385b857114d0e8a958cd24fa7d26..41495db77a242f554fc085b3ac81509c98f086c1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3501,6 +3501,11 @@ public abstract class LivingEntity extends Entity { +@@ -3510,6 +3510,11 @@ public abstract class LivingEntity extends Entity { return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; } @@ -22,7 +22,7 @@ index bb53c547e31ed9d7bcc04b06d774b70607ef927f..b8877b52e4ba032fc43d95647d177cd3 private void updatingUsingItem() { if (this.isUsingItem()) { if (ItemStack.isSameIgnoreDurability(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { -@@ -3518,8 +3523,12 @@ public abstract class LivingEntity extends Entity { +@@ -3527,8 +3532,12 @@ public abstract class LivingEntity extends Entity { if (this.shouldTriggerItemUseEffects()) { this.triggerItemUseEffects(stack, 5); } @@ -37,7 +37,7 @@ index bb53c547e31ed9d7bcc04b06d774b70607ef927f..b8877b52e4ba032fc43d95647d177cd3 this.completeUsingItem(); } -@@ -3567,7 +3576,10 @@ public abstract class LivingEntity extends Entity { +@@ -3576,7 +3585,10 @@ public abstract class LivingEntity extends Entity { if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag this.useItem = itemstack; @@ -49,7 +49,7 @@ index bb53c547e31ed9d7bcc04b06d774b70607ef927f..b8877b52e4ba032fc43d95647d177cd3 if (!this.level.isClientSide) { this.setLivingEntityFlag(1, true); this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND); -@@ -3591,7 +3603,10 @@ public abstract class LivingEntity extends Entity { +@@ -3600,7 +3612,10 @@ public abstract class LivingEntity extends Entity { } } else if (!this.isUsingItem() && !this.useItem.isEmpty()) { this.useItem = ItemStack.EMPTY; @@ -61,7 +61,7 @@ index bb53c547e31ed9d7bcc04b06d774b70607ef927f..b8877b52e4ba032fc43d95647d177cd3 } } -@@ -3719,7 +3734,10 @@ public abstract class LivingEntity extends Entity { +@@ -3728,7 +3743,10 @@ public abstract class LivingEntity extends Entity { } this.useItem = ItemStack.EMPTY; |