aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0309-Tracking-Range-Improvements.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-09-19 16:36:07 +0200
committerGitHub <[email protected]>2024-09-19 16:36:07 +0200
commitc5a10665b8b80af650500b9263036f778f06d500 (patch)
treefedc133f0dbc101067951e1fccd9d577c312fdb8 /patches/server/0309-Tracking-Range-Improvements.patch
parent5c829557332f21b34bc81e6ad1a73e511faef8f6 (diff)
downloadPaper-c5a10665b8b80af650500b9263036f778f06d500.tar.gz
Paper-c5a10665b8b80af650500b9263036f778f06d500.zip
Remove wall-time / unused skip tick protection (#11412)
Spigot still maintains some partial implementation of "tick skipping", a practice in which the MinecraftServer.currentTick field is updated not by an increment of one per actual tick, but instead set to System.currentTimeMillis() / 50. This behaviour means that the tracked tick may "skip" a tick value in case a previous tick took more than the expected 50ms. To compensate for this in important paths, spigot/craftbukkit implements "wall-time". Instead of incrementing/decrementing ticks on block entities/entities by one for each call to their tick() method, they instead increment/decrement important values, like an ItemEntity's age or pickupDelay, by the difference of `currentTick - lastTick`, where `lastTick` is the value of `currentTick` during the last tick() call. These "fixes" however do not play nicely with minecraft's simulation distance as entities/block entities implementing the above behaviour would "catch up" their values when moving from a non-ticking chunk to a ticking one as their `lastTick` value remains stuck on the last tick in a ticking chunk and hence lead to a large "catch up" once ticked again. Paper completely removes the "tick skipping" behaviour (See patch "Further-improve-server-tick-loop"), making the above precautions completely unnecessary, which also rids paper of the previous described incompatibility with non-ticking chunks.
Diffstat (limited to 'patches/server/0309-Tracking-Range-Improvements.patch')
-rw-r--r--patches/server/0309-Tracking-Range-Improvements.patch78
1 files changed, 78 insertions, 0 deletions
diff --git a/patches/server/0309-Tracking-Range-Improvements.patch b/patches/server/0309-Tracking-Range-Improvements.patch
new file mode 100644
index 0000000000..845b77df2e
--- /dev/null
+++ b/patches/server/0309-Tracking-Range-Improvements.patch
@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kickash32 <[email protected]>
+Date: Sat, 21 Dec 2019 15:22:09 -0500
+Subject: [PATCH] Tracking Range Improvements
+
+Sets tracking range of watermobs to animals instead of misc and simplifies code
+
+Also ignores Enderdragon, defaulting it to Mojang's setting
+
+diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
+index 5573a5d0d0e10e3c584e821d3e8e7ba64a41a627..ee54706b36bd227edacea2a1b6099009bd652039 100644
+--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
++++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
+@@ -1545,6 +1545,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ while (iterator.hasNext()) {
+ Entity entity = (Entity) iterator.next();
+ int j = entity.getType().clientTrackingRange() * 16;
++ j = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, j); // Paper
+
+ if (j > i) {
+ i = j;
+diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
+index 73f9563551632a5369ba55e8fe9211afc325e869..bb06f89a29f30144e7e2113e088a503db006a83c 100644
+--- a/src/main/java/org/spigotmc/TrackingRange.java
++++ b/src/main/java/org/spigotmc/TrackingRange.java
+@@ -7,7 +7,6 @@ import net.minecraft.world.entity.ExperienceOrb;
+ import net.minecraft.world.entity.decoration.ItemFrame;
+ import net.minecraft.world.entity.decoration.Painting;
+ import net.minecraft.world.entity.item.ItemEntity;
+-import net.minecraft.world.entity.monster.Ghast;
+
+ public class TrackingRange
+ {
+@@ -30,22 +29,21 @@ public class TrackingRange
+ if ( entity instanceof ServerPlayer )
+ {
+ return config.playerTrackingRange;
+- } else if ( entity.activationType == ActivationRange.ActivationType.MONSTER || entity.activationType == ActivationRange.ActivationType.RAIDER )
+- {
+- return config.monsterTrackingRange;
+- } else if ( entity instanceof Ghast )
+- {
+- if ( config.monsterTrackingRange > config.monsterActivationRange )
+- {
++ // Paper start - Simplify and set water mobs to animal tracking range
++ }
++ switch (entity.activationType) {
++ case RAIDER:
++ case MONSTER:
++ case FLYING_MONSTER:
+ return config.monsterTrackingRange;
+- } else
+- {
+- return config.monsterActivationRange;
+- }
+- } else if ( entity.activationType == ActivationRange.ActivationType.ANIMAL )
+- {
+- return config.animalTrackingRange;
+- } else if ( entity instanceof ItemFrame || entity instanceof Painting || entity instanceof ItemEntity || entity instanceof ExperienceOrb )
++ case WATER:
++ case VILLAGER:
++ case ANIMAL:
++ return config.animalTrackingRange;
++ case MISC:
++ }
++ if ( entity instanceof ItemFrame || entity instanceof Painting || entity instanceof ItemEntity || entity instanceof ExperienceOrb )
++ // Paper end
+ {
+ return config.miscTrackingRange;
+ } else if ( entity instanceof Display )
+@@ -53,6 +51,7 @@ public class TrackingRange
+ return config.displayTrackingRange;
+ } else
+ {
++ if (entity instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon) return ((net.minecraft.server.level.ServerLevel)(entity.getCommandSenderWorld())).getChunkSource().chunkMap.serverViewDistance; // Paper - enderdragon is exempt
+ return config.otherTrackingRange;
+ }
+ }