aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1037-Lag-compensation-ticks.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2024-07-15 11:11:04 -0700
committerSpottedleaf <[email protected]>2024-07-15 11:13:08 -0700
commit3b45454190b8d8842c2e8804f8535078f2540864 (patch)
treeddcef342cdb253a5017858e095bca8307429e6f3 /patches/server/1037-Lag-compensation-ticks.patch
parent8b230185755c54a85194d85461f0a4262185c10c (diff)
downloadPaper-3b45454190b8d8842c2e8804f8535078f2540864.tar.gz
Paper-3b45454190b8d8842c2e8804f8535078f2540864.zip
Port random ticking optimisation from Moonrise
Diffstat (limited to 'patches/server/1037-Lag-compensation-ticks.patch')
-rw-r--r--patches/server/1037-Lag-compensation-ticks.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/1037-Lag-compensation-ticks.patch b/patches/server/1037-Lag-compensation-ticks.patch
index b92fcffe58..1e0cd73447 100644
--- a/patches/server/1037-Lag-compensation-ticks.patch
+++ b/patches/server/1037-Lag-compensation-ticks.patch
@@ -28,10 +28,10 @@ index 330bee331335454a61cf8350a6654217c8124445..54e581db732c3a104142a2bbc228ecbe
this.profiler.push(() -> {
String s = String.valueOf(worldserver);
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7ba34da235ea536b929e1c8bc2cc39e48b33f5aa..dafc35584d86ed1c18e4f328cb92523952664f73 100644
+index 2a08dfbda588bd6282d78b35bf33a0802b178a70..9c9107add605c09445cf795f4c850b080b4f995d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -518,6 +518,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -509,6 +509,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
return this.nearbyPlayers;
}
// Paper end - rewrite chunk system
@@ -63,7 +63,7 @@ index 24b1715397ba8e6f5e9841a030d0e3d964356f89..cc01ead133cc6859ca5d7a1d0ac3c129
if (this.hasDelayedDestroy) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 909accac7538e1c0c0c51deb2ee0605697c059d0..4c4050fe8f3b788481350caeb2077fa91be12060 100644
+index d6699caad1909857793e34228cff78dd3b8b6f41..fe435d4a387bb28be6831cec0c8bb0a7c8b603a4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3900,6 +3900,10 @@ public abstract class LivingEntity extends Entity implements Attackable {