aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0743-Don-t-tick-markers.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0743-Don-t-tick-markers.patch')
-rw-r--r--patches/server/0743-Don-t-tick-markers.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/server/0743-Don-t-tick-markers.patch b/patches/server/0743-Don-t-tick-markers.patch
new file mode 100644
index 0000000000..ae96fa4757
--- /dev/null
+++ b/patches/server/0743-Don-t-tick-markers.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Noah van der Aa <[email protected]>
+Date: Fri, 7 Jan 2022 11:58:26 +0100
+Subject: [PATCH] Don't tick markers
+
+Fixes https://github.com/PaperMC/Paper/issues/7276 and https://github.com/PaperMC/Paper/issues/8118
+by using a config option that, when set to false, does not add markers to the entity
+tick list at all and ignores them in Spigot's activation range checks. The entity tick
+list is only used in the tick and tickPassenger methods, so we can safely not add the
+markers to it. When the config option is set to true, markers are ticked as normal.
+
+diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
+index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612ddc305b07 100644
+--- a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
++++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
+@@ -109,7 +109,7 @@ public final class EntityCommand implements PaperSubcommand {
+ ChunkPos chunk = e.chunkPosition();
+ info.left++;
+ info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
+- if (!chunkProviderServer.isPositionTicking(e)) {
++ if (!chunkProviderServer.isPositionTicking(e) || (e instanceof net.minecraft.world.entity.Marker && !world.paperConfig().entities.markers.tick)) { // Paper - Configurable marker ticking
+ nonEntityTicking.merge(key, 1, Integer::sum);
+ }
+ });
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 5ed27de9be5300b22cd29b57385e93e6e97ef361..196c776fdb20aac5a9ad5692c47f61c979e4ace0 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -2235,6 +2235,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+ }
+
+ public void onTickingStart(Entity entity) {
++ if (entity instanceof net.minecraft.world.entity.Marker && !paperConfig().entities.markers.tick) return; // Paper - Configurable marker ticking
+ ServerLevel.this.entityTickList.add(entity);
+ }
+