From 235d6cc2dd2ea2edfd61d8070c3e1d7d770fc3ba Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 11 Jul 2024 12:22:59 -0700 Subject: [PATCH] Port lag compensation patch --- .../server/Lag-compensation-ticks.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename patches/{unapplied => }/server/Lag-compensation-ticks.patch (97%) diff --git a/patches/unapplied/server/Lag-compensation-ticks.patch b/patches/server/Lag-compensation-ticks.patch similarity index 97% rename from patches/unapplied/server/Lag-compensation-ticks.patch rename to patches/server/Lag-compensation-ticks.patch index 9d5bcc1fba..6f404d22d2 100644 --- a/patches/unapplied/server/Lag-compensation-ticks.patch +++ b/patches/server/Lag-compensation-ticks.patch @@ -31,10 +31,10 @@ diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/mai index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { - return player != null && player.level() == this ? player : null; +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. + return this.nearbyPlayers; } - // Paper end - optimise getPlayerByUUID + // Paper end - rewrite chunk system + // Paper start - lag compensation + private long lagCompensationTick = net.minecraft.server.MinecraftServer.SERVER_INIT; + @@ -95,9 +95,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper - Prevent consuming the wrong itemstack this.useItem = itemstack; -- this.useItemRemaining = itemstack.getUseDuration(); +- this.useItemRemaining = itemstack.getUseDuration(this); + // Paper start - lag compensate eating -+ this.useItemRemaining = this.totalEatTimeTicks = itemstack.getUseDuration(); ++ this.useItemRemaining = this.totalEatTimeTicks = itemstack.getUseDuration(this); + this.eatStartTime = System.nanoTime(); + // Paper end - lag compensate eating if (!this.level().isClientSide) {